diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2017-12-28 17:48:22 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2017-12-28 17:48:22 +0200 |
| commit | cfee058447ffb5528c33d395165fc48ec0d37aac (patch) | |
| tree | 74d48bbda8a64e526a4a17ba0e0aed6513160a6c /Software | |
| parent | d4473bc755cd5a08c6eb2e9c894d79c7bb118f72 (diff) | |
| download | Tango-cfee058447ffb5528c33d395165fc48ec0d37aac.tar.gz Tango-cfee058447ffb5528c33d395165fc48ec0d37aac.zip | |
Some stuff..
Diffstat (limited to 'Software')
29 files changed, 6220 insertions, 639 deletions
diff --git a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java b/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java index 24ae72eba..99e2293ae 100644 --- a/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java +++ b/Software/Android_Studio/Tango.Integration/src/main/java/com/twine/tango/integration/services/ExternalBridgeService.java @@ -100,7 +100,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal sendPacket = new DatagramPacket(packet, packet.length, InetAddress.getByName("255.255.255.255"), 8888); socket.send(sendPacket); - } catch (IOException e) + } + catch (IOException e) { XLog.e(e); } @@ -122,7 +123,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal for (int k = 0; k < 4; k++) quads[k] = (byte) ((broadcast >> k * 8) & 0xFF); return InetAddress.getByAddress(quads); - } else + } + else { return null; } @@ -135,7 +137,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal try { listener.close(); - } catch (IOException e) + } + catch (IOException e) { e.printStackTrace(); } @@ -178,7 +181,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal connect().blockingAwait(); } - } catch (IOException e) + } + catch (IOException e) { XLog.e(e); } @@ -206,7 +210,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal ExternalClientLoginResponse.class, ExternalClientLoginResponse.newBuilder().setAuthenticated(true).build(), container.getToken())); - } else + } + else { getAdapters().get(0).setAuthenticated(false); sendResponse(MessageFactory.createTangoMessage( @@ -231,7 +236,8 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal //noinspection unchecked receiver.handler.invoke(this, new MessageReceivedArgs(container, message)); } - } else + } + else { //Route to machine... if (container.getContinuous()) @@ -242,9 +248,13 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal sendResponse((TangoMessage<? extends GeneratedMessageV3>) response); }, (ex) -> { - sendResponse((TangoMessage<? extends GeneratedMessageV3>) ((ResponseErrorException)ex).getResponse()); + if (ex.getClass() == ResponseErrorException.class) + { + sendResponse((TangoMessage<? extends GeneratedMessageV3>) ((ResponseErrorException) ex).getResponse()); + } }); - } else + } + else { //noinspection unchecked machineOperator.sendRequest(MessageFactory.createTangoMessage(container, message)).subscribe((response) -> @@ -252,16 +262,21 @@ public class ExternalBridgeService extends ProtoTransporter implements IExternal sendResponse((TangoMessage<? extends GeneratedMessageV3>) response); }, (ex) -> { - sendResponse((TangoMessage<? extends GeneratedMessageV3>) ((ResponseErrorException)ex).getResponse()); + if (ex.getClass() == ResponseErrorException.class) + { + sendResponse((TangoMessage<? extends GeneratedMessageV3>) ((ResponseErrorException) ex).getResponse()); + } }); } } - } else + } + else { XLog.w("Message received from an unauthorized adapter!"); } - } catch (Exception e) + } + catch (Exception e) { XLog.e(e); } diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java index f2d42989a..42b46a576 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/common/MessageTypeOuterClass.java @@ -32,6 +32,10 @@ public final class MessageTypeOuterClass { */ Segment(2), /** + * <pre> + *Stubs + * </pre> + * * <code>CalculateRequest = 3;</code> */ CalculateRequest(3), @@ -152,41 +156,61 @@ public final class MessageTypeOuterClass { */ StubValveResponse(32), /** - * <code>ExternalBridgeUdpDiscoveryPacket = 33;</code> + * <code>StubExtFlashReadRequest = 33;</code> */ - ExternalBridgeUdpDiscoveryPacket(33), + StubExtFlashReadRequest(33), /** - * <code>ExternalClientLoginRequest = 34;</code> + * <code>StubExtFlashReadResponse = 34;</code> */ - ExternalClientLoginRequest(34), + StubExtFlashReadResponse(34), /** - * <code>ExternalClientLoginResponse = 35;</code> + * <code>StubExtFlashWriteRequest = 35;</code> */ - ExternalClientLoginResponse(35), + StubExtFlashWriteRequest(35), /** - * <code>DirectSynchronizationRequest = 36;</code> + * <code>StubExtFlashWriteResponse = 36;</code> */ - DirectSynchronizationRequest(36), + StubExtFlashWriteResponse(36), /** - * <code>DirectSynchronizationResponse = 37;</code> + * <pre> + *Integration + * </pre> + * + * <code>ExternalBridgeUdpDiscoveryPacket = 1000;</code> */ - DirectSynchronizationResponse(37), + ExternalBridgeUdpDiscoveryPacket(1000), /** - * <code>OverrideDataBaseRequest = 38;</code> + * <code>ExternalClientLoginRequest = 1001;</code> */ - OverrideDataBaseRequest(38), + ExternalClientLoginRequest(1001), /** - * <code>OverrideDataBaseResponse = 39;</code> + * <code>ExternalClientLoginResponse = 1002;</code> */ - OverrideDataBaseResponse(39), + ExternalClientLoginResponse(1002), /** - * <code>KeepAliveRequest = 40;</code> + * <code>DirectSynchronizationRequest = 1003;</code> */ - KeepAliveRequest(40), + DirectSynchronizationRequest(1003), /** - * <code>KeepAliveResponse = 41;</code> + * <code>DirectSynchronizationResponse = 1004;</code> */ - KeepAliveResponse(41), + DirectSynchronizationResponse(1004), + /** + * <code>OverrideDataBaseRequest = 1005;</code> + */ + OverrideDataBaseRequest(1005), + /** + * <code>OverrideDataBaseResponse = 1006;</code> + */ + OverrideDataBaseResponse(1006), + /** + * <code>KeepAliveRequest = 1007;</code> + */ + KeepAliveRequest(1007), + /** + * <code>KeepAliveResponse = 1008;</code> + */ + KeepAliveResponse(1008), UNRECOGNIZED(-1), ; @@ -203,6 +227,10 @@ public final class MessageTypeOuterClass { */ public static final int Segment_VALUE = 2; /** + * <pre> + *Stubs + * </pre> + * * <code>CalculateRequest = 3;</code> */ public static final int CalculateRequest_VALUE = 3; @@ -323,41 +351,61 @@ public final class MessageTypeOuterClass { */ public static final int StubValveResponse_VALUE = 32; /** - * <code>ExternalBridgeUdpDiscoveryPacket = 33;</code> + * <code>StubExtFlashReadRequest = 33;</code> + */ + public static final int StubExtFlashReadRequest_VALUE = 33; + /** + * <code>StubExtFlashReadResponse = 34;</code> + */ + public static final int StubExtFlashReadResponse_VALUE = 34; + /** + * <code>StubExtFlashWriteRequest = 35;</code> + */ + public static final int StubExtFlashWriteRequest_VALUE = 35; + /** + * <code>StubExtFlashWriteResponse = 36;</code> + */ + public static final int StubExtFlashWriteResponse_VALUE = 36; + /** + * <pre> + *Integration + * </pre> + * + * <code>ExternalBridgeUdpDiscoveryPacket = 1000;</code> */ - public static final int ExternalBridgeUdpDiscoveryPacket_VALUE = 33; + public static final int ExternalBridgeUdpDiscoveryPacket_VALUE = 1000; /** - * <code>ExternalClientLoginRequest = 34;</code> + * <code>ExternalClientLoginRequest = 1001;</code> */ - public static final int ExternalClientLoginRequest_VALUE = 34; + public static final int ExternalClientLoginRequest_VALUE = 1001; /** - * <code>ExternalClientLoginResponse = 35;</code> + * <code>ExternalClientLoginResponse = 1002;</code> */ - public static final int ExternalClientLoginResponse_VALUE = 35; + public static final int ExternalClientLoginResponse_VALUE = 1002; /** - * <code>DirectSynchronizationRequest = 36;</code> + * <code>DirectSynchronizationRequest = 1003;</code> */ - public static final int DirectSynchronizationRequest_VALUE = 36; + public static final int DirectSynchronizationRequest_VALUE = 1003; /** - * <code>DirectSynchronizationResponse = 37;</code> + * <code>DirectSynchronizationResponse = 1004;</code> */ - public static final int DirectSynchronizationResponse_VALUE = 37; + public static final int DirectSynchronizationResponse_VALUE = 1004; /** - * <code>OverrideDataBaseRequest = 38;</code> + * <code>OverrideDataBaseRequest = 1005;</code> */ - public static final int OverrideDataBaseRequest_VALUE = 38; + public static final int OverrideDataBaseRequest_VALUE = 1005; /** - * <code>OverrideDataBaseResponse = 39;</code> + * <code>OverrideDataBaseResponse = 1006;</code> */ - public static final int OverrideDataBaseResponse_VALUE = 39; + public static final int OverrideDataBaseResponse_VALUE = 1006; /** - * <code>KeepAliveRequest = 40;</code> + * <code>KeepAliveRequest = 1007;</code> */ - public static final int KeepAliveRequest_VALUE = 40; + public static final int KeepAliveRequest_VALUE = 1007; /** - * <code>KeepAliveResponse = 41;</code> + * <code>KeepAliveResponse = 1008;</code> */ - public static final int KeepAliveResponse_VALUE = 41; + public static final int KeepAliveResponse_VALUE = 1008; public final int getNumber() { @@ -411,15 +459,19 @@ public final class MessageTypeOuterClass { case 30: return StubSteperMotorResponse; case 31: return StubValveRequest; case 32: return StubValveResponse; - case 33: return ExternalBridgeUdpDiscoveryPacket; - case 34: return ExternalClientLoginRequest; - case 35: return ExternalClientLoginResponse; - case 36: return DirectSynchronizationRequest; - case 37: return DirectSynchronizationResponse; - case 38: return OverrideDataBaseRequest; - case 39: return OverrideDataBaseResponse; - case 40: return KeepAliveRequest; - case 41: return KeepAliveResponse; + case 33: return StubExtFlashReadRequest; + case 34: return StubExtFlashReadResponse; + case 35: return StubExtFlashWriteRequest; + case 36: return StubExtFlashWriteResponse; + case 1000: return ExternalBridgeUdpDiscoveryPacket; + case 1001: return ExternalClientLoginRequest; + case 1002: return ExternalClientLoginResponse; + case 1003: return DirectSynchronizationRequest; + case 1004: return DirectSynchronizationResponse; + case 1005: return OverrideDataBaseRequest; + case 1006: return OverrideDataBaseResponse; + case 1007: return KeepAliveRequest; + case 1008: return KeepAliveResponse; default: return null; } } @@ -481,7 +533,7 @@ public final class MessageTypeOuterClass { descriptor; static { java.lang.String[] descriptorData = { - "\n\021MessageType.proto\022\020Tango.PMR.Common*\203\t" + + "\n\021MessageType.proto\022\020Tango.PMR.Common*\204\n" + "\n\013MessageType\022\007\n\003RGB\020\000\022\007\n\003Job\020\001\022\013\n\007Segme" + "nt\020\002\022\024\n\020CalculateRequest\020\003\022\025\n\021CalculateR" + "esponse\020\004\022\023\n\017ProgressRequest\020\005\022\024\n\020Progre" + @@ -504,14 +556,18 @@ public final class MessageTypeOuterClass { "tSwitchResponse\020\034\022\032\n\026StubSteperMotorRequ" + "est\020\035\022\033\n\027StubSteperMotorResponse\020\036\022\024\n\020St" + "ubValveRequest\020\037\022\025\n\021StubValveResponse\020 \022" + - "$\n ExternalBridgeUdpDiscoveryPacket\020!\022\036\n" + - "\032ExternalClientLoginRequest\020\"\022\037\n\033Externa" + - "lClientLoginResponse\020#\022 \n\034DirectSynchron" + - "izationRequest\020$\022!\n\035DirectSynchronizatio" + - "nResponse\020%\022\033\n\027OverrideDataBaseRequest\020&" + - "\022\034\n\030OverrideDataBaseResponse\020\'\022\024\n\020KeepAl" + - "iveRequest\020(\022\025\n\021KeepAliveResponse\020)B\034\n\032c", - "om.twine.tango.pmr.commonb\006proto3" + "\033\n\027StubExtFlashReadRequest\020!\022\034\n\030StubExtF" + + "lashReadResponse\020\"\022\034\n\030StubExtFlashWriteR" + + "equest\020#\022\035\n\031StubExtFlashWriteResponse\020$\022" + + "%\n ExternalBridgeUdpDiscoveryPacket\020\350\007\022\037" + + "\n\032ExternalClientLoginRequest\020\351\007\022 \n\033Exter" + + "nalClientLoginResponse\020\352\007\022!\n\034DirectSynch" + + "ronizationRequest\020\353\007\022\"\n\035DirectSynchroniz", + "ationResponse\020\354\007\022\034\n\027OverrideDataBaseRequ" + + "est\020\355\007\022\035\n\030OverrideDataBaseResponse\020\356\007\022\025\n" + + "\020KeepAliveRequest\020\357\007\022\026\n\021KeepAliveRespons" + + "e\020\360\007B\034\n\032com.twine.tango.pmr.commonb\006prot" + + "o3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadResponseOuterClass.java index d25c1abcc..1d4437bf2 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeReadResponseOuterClass.java @@ -24,29 +24,51 @@ public final class StubCartridgeReadResponseOuterClass { int getCartridgeId(); /** - * <code>uint32 CartridgeColor = 3;</code> + * <code>uint32 CartridgeColor = 2;</code> */ int getCartridgeColor(); /** - * <code>uint32 CartridgeVersion = 4;</code> + * <code>uint32 CartridgeVersion = 3;</code> */ int getCartridgeVersion(); /** - * <code>int32 CartridgeData = 5;</code> + * <code>int32 CartridgeData = 4;</code> */ int getCartridgeData(); /** - * <code>bool CartridgeUsed = 6;</code> + * <code>bool CartridgeUsed = 5;</code> */ boolean getCartridgeUsed(); /** - * <code>uint32 Status = 8;</code> + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> */ - int getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 7;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubCartridgeReadResponse} @@ -66,7 +88,8 @@ public final class StubCartridgeReadResponseOuterClass { cartridgeVersion_ = 0; cartridgeData_ = 0; cartridgeUsed_ = false; - status_ = 0; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -102,29 +125,35 @@ public final class StubCartridgeReadResponseOuterClass { cartridgeId_ = input.readUInt32(); break; } - case 24: { + case 16: { cartridgeColor_ = input.readUInt32(); break; } - case 32: { + case 24: { cartridgeVersion_ = input.readUInt32(); break; } - case 40: { + case 32: { cartridgeData_ = input.readInt32(); break; } - case 48: { + case 40: { cartridgeUsed_ = input.readBool(); break; } - case 64: { + case 50: { + java.lang.String s = input.readStringRequireUtf8(); - status_ = input.readUInt32(); + status_ = s; + break; + } + case 56: { + + statusWord_ = input.readUInt32(); break; } } @@ -160,49 +189,95 @@ public final class StubCartridgeReadResponseOuterClass { return cartridgeId_; } - public static final int CARTRIDGECOLOR_FIELD_NUMBER = 3; + public static final int CARTRIDGECOLOR_FIELD_NUMBER = 2; private int cartridgeColor_; /** - * <code>uint32 CartridgeColor = 3;</code> + * <code>uint32 CartridgeColor = 2;</code> */ public int getCartridgeColor() { return cartridgeColor_; } - public static final int CARTRIDGEVERSION_FIELD_NUMBER = 4; + public static final int CARTRIDGEVERSION_FIELD_NUMBER = 3; private int cartridgeVersion_; /** - * <code>uint32 CartridgeVersion = 4;</code> + * <code>uint32 CartridgeVersion = 3;</code> */ public int getCartridgeVersion() { return cartridgeVersion_; } - public static final int CARTRIDGEDATA_FIELD_NUMBER = 5; + public static final int CARTRIDGEDATA_FIELD_NUMBER = 4; private int cartridgeData_; /** - * <code>int32 CartridgeData = 5;</code> + * <code>int32 CartridgeData = 4;</code> */ public int getCartridgeData() { return cartridgeData_; } - public static final int CARTRIDGEUSED_FIELD_NUMBER = 6; + public static final int CARTRIDGEUSED_FIELD_NUMBER = 5; private boolean cartridgeUsed_; /** - * <code>bool CartridgeUsed = 6;</code> + * <code>bool CartridgeUsed = 5;</code> */ public boolean getCartridgeUsed() { return cartridgeUsed_; } - public static final int STATUS_FIELD_NUMBER = 8; - private int status_; + public static final int STATUS_FIELD_NUMBER = 6; + private volatile java.lang.Object status_; + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 7; + private int statusWord_; /** - * <code>uint32 Status = 8;</code> + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 7;</code> */ - public int getStatus() { - return status_; + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -221,19 +296,22 @@ public final class StubCartridgeReadResponseOuterClass { output.writeUInt32(1, cartridgeId_); } if (cartridgeColor_ != 0) { - output.writeUInt32(3, cartridgeColor_); + output.writeUInt32(2, cartridgeColor_); } if (cartridgeVersion_ != 0) { - output.writeUInt32(4, cartridgeVersion_); + output.writeUInt32(3, cartridgeVersion_); } if (cartridgeData_ != 0) { - output.writeInt32(5, cartridgeData_); + output.writeInt32(4, cartridgeData_); } if (cartridgeUsed_ != false) { - output.writeBool(6, cartridgeUsed_); + output.writeBool(5, cartridgeUsed_); } - if (status_ != 0) { - output.writeUInt32(8, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(7, statusWord_); } unknownFields.writeTo(output); } @@ -249,23 +327,26 @@ public final class StubCartridgeReadResponseOuterClass { } if (cartridgeColor_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, cartridgeColor_); + .computeUInt32Size(2, cartridgeColor_); } if (cartridgeVersion_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, cartridgeVersion_); + .computeUInt32Size(3, cartridgeVersion_); } if (cartridgeData_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeInt32Size(5, cartridgeData_); + .computeInt32Size(4, cartridgeData_); } if (cartridgeUsed_ != false) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(6, cartridgeUsed_); + .computeBoolSize(5, cartridgeUsed_); + } + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, status_); } - if (status_ != 0) { + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, status_); + .computeUInt32Size(7, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -293,8 +374,10 @@ public final class StubCartridgeReadResponseOuterClass { == other.getCartridgeData()); result = result && (getCartridgeUsed() == other.getCartridgeUsed()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -318,7 +401,9 @@ public final class StubCartridgeReadResponseOuterClass { hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getCartridgeUsed()); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + getStatus(); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -458,7 +543,9 @@ public final class StubCartridgeReadResponseOuterClass { cartridgeUsed_ = false; - status_ = 0; + status_ = ""; + + statusWord_ = 0; return this; } @@ -488,6 +575,7 @@ public final class StubCartridgeReadResponseOuterClass { result.cartridgeData_ = cartridgeData_; result.cartridgeUsed_ = cartridgeUsed_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -544,8 +632,12 @@ public final class StubCartridgeReadResponseOuterClass { if (other.getCartridgeUsed() != false) { setCartridgeUsed(other.getCartridgeUsed()); } - if (other.getStatus() != 0) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -602,13 +694,13 @@ public final class StubCartridgeReadResponseOuterClass { private int cartridgeColor_ ; /** - * <code>uint32 CartridgeColor = 3;</code> + * <code>uint32 CartridgeColor = 2;</code> */ public int getCartridgeColor() { return cartridgeColor_; } /** - * <code>uint32 CartridgeColor = 3;</code> + * <code>uint32 CartridgeColor = 2;</code> */ public Builder setCartridgeColor(int value) { @@ -617,7 +709,7 @@ public final class StubCartridgeReadResponseOuterClass { return this; } /** - * <code>uint32 CartridgeColor = 3;</code> + * <code>uint32 CartridgeColor = 2;</code> */ public Builder clearCartridgeColor() { @@ -628,13 +720,13 @@ public final class StubCartridgeReadResponseOuterClass { private int cartridgeVersion_ ; /** - * <code>uint32 CartridgeVersion = 4;</code> + * <code>uint32 CartridgeVersion = 3;</code> */ public int getCartridgeVersion() { return cartridgeVersion_; } /** - * <code>uint32 CartridgeVersion = 4;</code> + * <code>uint32 CartridgeVersion = 3;</code> */ public Builder setCartridgeVersion(int value) { @@ -643,7 +735,7 @@ public final class StubCartridgeReadResponseOuterClass { return this; } /** - * <code>uint32 CartridgeVersion = 4;</code> + * <code>uint32 CartridgeVersion = 3;</code> */ public Builder clearCartridgeVersion() { @@ -654,13 +746,13 @@ public final class StubCartridgeReadResponseOuterClass { private int cartridgeData_ ; /** - * <code>int32 CartridgeData = 5;</code> + * <code>int32 CartridgeData = 4;</code> */ public int getCartridgeData() { return cartridgeData_; } /** - * <code>int32 CartridgeData = 5;</code> + * <code>int32 CartridgeData = 4;</code> */ public Builder setCartridgeData(int value) { @@ -669,7 +761,7 @@ public final class StubCartridgeReadResponseOuterClass { return this; } /** - * <code>int32 CartridgeData = 5;</code> + * <code>int32 CartridgeData = 4;</code> */ public Builder clearCartridgeData() { @@ -680,13 +772,13 @@ public final class StubCartridgeReadResponseOuterClass { private boolean cartridgeUsed_ ; /** - * <code>bool CartridgeUsed = 6;</code> + * <code>bool CartridgeUsed = 5;</code> */ public boolean getCartridgeUsed() { return cartridgeUsed_; } /** - * <code>bool CartridgeUsed = 6;</code> + * <code>bool CartridgeUsed = 5;</code> */ public Builder setCartridgeUsed(boolean value) { @@ -695,7 +787,7 @@ public final class StubCartridgeReadResponseOuterClass { return this; } /** - * <code>bool CartridgeUsed = 6;</code> + * <code>bool CartridgeUsed = 5;</code> */ public Builder clearCartridgeUsed() { @@ -704,28 +796,129 @@ public final class StubCartridgeReadResponseOuterClass { return this; } - private int status_ ; + private java.lang.Object status_ = ""; /** - * <code>uint32 Status = 8;</code> + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> */ - public int getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** - * <code>uint32 Status = 8;</code> + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> */ - public Builder setStatus(int value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** - * <code>uint32 Status = 8;</code> + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> */ public Builder clearStatus() { - status_ = 0; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 7;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 7;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 7;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -793,12 +986,12 @@ public final class StubCartridgeReadResponseOuterClass { static { java.lang.String[] descriptorData = { "\n\037StubCartridgeReadResponse.proto\022\017Tango" + - ".PMR.Stubs\"\240\001\n\031StubCartridgeReadResponse" + + ".PMR.Stubs\"\264\001\n\031StubCartridgeReadResponse" + "\022\023\n\013CartridgeId\030\001 \001(\r\022\026\n\016CartridgeColor\030" + - "\003 \001(\r\022\030\n\020CartridgeVersion\030\004 \001(\r\022\025\n\rCartr" + - "idgeData\030\005 \001(\005\022\025\n\rCartridgeUsed\030\006 \001(\010\022\016\n" + - "\006Status\030\010 \001(\rB\033\n\031com.twine.tango.pmr.stu" + - "bsb\006proto3" + "\002 \001(\r\022\030\n\020CartridgeVersion\030\003 \001(\r\022\025\n\rCartr" + + "idgeData\030\004 \001(\005\022\025\n\rCartridgeUsed\030\005 \001(\010\022\016\n" + + "\006Status\030\006 \001(\t\022\022\n\nStatusWord\030\007 \001(\rB\033\n\031com" + + ".twine.tango.pmr.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -817,7 +1010,7 @@ public final class StubCartridgeReadResponseOuterClass { internal_static_Tango_PMR_Stubs_StubCartridgeReadResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubCartridgeReadResponse_descriptor, - new java.lang.String[] { "CartridgeId", "CartridgeColor", "CartridgeVersion", "CartridgeData", "CartridgeUsed", "Status", }); + new java.lang.String[] { "CartridgeId", "CartridgeColor", "CartridgeVersion", "CartridgeData", "CartridgeUsed", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteResponseOuterClass.java index 12795b75c..abcdd9ed2 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubCartridgeWriteResponseOuterClass.java @@ -24,9 +24,31 @@ public final class StubCartridgeWriteResponseOuterClass { int getCartridgeId(); /** - * <code>uint32 Status = 8;</code> + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> */ - int getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 3;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubCartridgeWriteResponse} @@ -42,7 +64,8 @@ public final class StubCartridgeWriteResponseOuterClass { } private StubCartridgeWriteResponse() { cartridgeId_ = 0; - status_ = 0; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -78,9 +101,15 @@ public final class StubCartridgeWriteResponseOuterClass { cartridgeId_ = input.readUInt32(); break; } - case 64: { + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + status_ = s; + break; + } + case 24: { - status_ = input.readUInt32(); + statusWord_ = input.readUInt32(); break; } } @@ -116,13 +145,59 @@ public final class StubCartridgeWriteResponseOuterClass { return cartridgeId_; } - public static final int STATUS_FIELD_NUMBER = 8; - private int status_; + public static final int STATUS_FIELD_NUMBER = 2; + private volatile java.lang.Object status_; /** - * <code>uint32 Status = 8;</code> + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> */ - public int getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 3; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 3;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -140,8 +215,11 @@ public final class StubCartridgeWriteResponseOuterClass { if (cartridgeId_ != 0) { output.writeUInt32(1, cartridgeId_); } - if (status_ != 0) { - output.writeUInt32(8, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(3, statusWord_); } unknownFields.writeTo(output); } @@ -155,9 +233,12 @@ public final class StubCartridgeWriteResponseOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(1, cartridgeId_); } - if (status_ != 0) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(8, status_); + .computeUInt32Size(3, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -177,8 +258,10 @@ public final class StubCartridgeWriteResponseOuterClass { boolean result = true; result = result && (getCartridgeId() == other.getCartridgeId()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -193,7 +276,9 @@ public final class StubCartridgeWriteResponseOuterClass { hash = (37 * hash) + CARTRIDGEID_FIELD_NUMBER; hash = (53 * hash) + getCartridgeId(); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + getStatus(); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -325,7 +410,9 @@ public final class StubCartridgeWriteResponseOuterClass { super.clear(); cartridgeId_ = 0; - status_ = 0; + status_ = ""; + + statusWord_ = 0; return this; } @@ -351,6 +438,7 @@ public final class StubCartridgeWriteResponseOuterClass { com.twine.tango.pmr.stubs.StubCartridgeWriteResponseOuterClass.StubCartridgeWriteResponse result = new com.twine.tango.pmr.stubs.StubCartridgeWriteResponseOuterClass.StubCartridgeWriteResponse(this); result.cartridgeId_ = cartridgeId_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -395,8 +483,12 @@ public final class StubCartridgeWriteResponseOuterClass { if (other.getCartridgeId() != 0) { setCartridgeId(other.getCartridgeId()); } - if (other.getStatus() != 0) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -451,28 +543,129 @@ public final class StubCartridgeWriteResponseOuterClass { return this; } - private int status_ ; + private java.lang.Object status_ = ""; /** - * <code>uint32 Status = 8;</code> + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> */ - public int getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** - * <code>uint32 Status = 8;</code> + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> */ - public Builder setStatus(int value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** - * <code>uint32 Status = 8;</code> + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> */ public Builder clearStatus() { - status_ = 0; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 3;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 3;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 3;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -540,9 +733,10 @@ public final class StubCartridgeWriteResponseOuterClass { static { java.lang.String[] descriptorData = { "\n StubCartridgeWriteResponse.proto\022\017Tang" + - "o.PMR.Stubs\"A\n\032StubCartridgeWriteRespons" + - "e\022\023\n\013CartridgeId\030\001 \001(\r\022\016\n\006Status\030\010 \001(\rB\033" + - "\n\031com.twine.tango.pmr.stubsb\006proto3" + "o.PMR.Stubs\"U\n\032StubCartridgeWriteRespons" + + "e\022\023\n\013CartridgeId\030\001 \001(\r\022\016\n\006Status\030\002 \001(\t\022\022" + + "\n\nStatusWord\030\003 \001(\rB\033\n\031com.twine.tango.pm" + + "r.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -561,7 +755,7 @@ public final class StubCartridgeWriteResponseOuterClass { internal_static_Tango_PMR_Stubs_StubCartridgeWriteResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubCartridgeWriteResponse_descriptor, - new java.lang.String[] { "CartridgeId", "Status", }); + new java.lang.String[] { "CartridgeId", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserResponseOuterClass.java index 8f6354be7..2d31705c8 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubDispenserResponseOuterClass.java @@ -46,12 +46,30 @@ public final class StubDispenserResponseOuterClass { /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 4;</code> + * <code>string Status = 4;</code> */ - boolean getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 4;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 5;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubDispenserResponse} @@ -69,7 +87,8 @@ public final class StubDispenserResponseOuterClass { dispenserId_ = 0; dispenserPosition_ = 0; inkWorningLevel_ = 0; - status_ = false; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -115,9 +134,15 @@ public final class StubDispenserResponseOuterClass { inkWorningLevel_ = input.readUInt32(); break; } - case 32: { + case 34: { + java.lang.String s = input.readStringRequireUtf8(); - status_ = input.readBool(); + status_ = s; + break; + } + case 40: { + + statusWord_ = input.readUInt32(); break; } } @@ -183,16 +208,58 @@ public final class StubDispenserResponseOuterClass { } public static final int STATUS_FIELD_NUMBER = 4; - private boolean status_; + private volatile java.lang.Object status_; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 4;</code> + * <code>string Status = 4;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 4;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 5; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 5;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -216,8 +283,11 @@ public final class StubDispenserResponseOuterClass { if (inkWorningLevel_ != 0) { output.writeUInt32(3, inkWorningLevel_); } - if (status_ != false) { - output.writeBool(4, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(5, statusWord_); } unknownFields.writeTo(output); } @@ -239,9 +309,12 @@ public final class StubDispenserResponseOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(3, inkWorningLevel_); } - if (status_ != false) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(4, status_); + .computeUInt32Size(5, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -265,8 +338,10 @@ public final class StubDispenserResponseOuterClass { == other.getDispenserPosition()); result = result && (getInkWorningLevel() == other.getInkWorningLevel()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -285,8 +360,9 @@ public final class StubDispenserResponseOuterClass { hash = (37 * hash) + INKWORNINGLEVEL_FIELD_NUMBER; hash = (53 * hash) + getInkWorningLevel(); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getStatus()); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -422,7 +498,9 @@ public final class StubDispenserResponseOuterClass { inkWorningLevel_ = 0; - status_ = false; + status_ = ""; + + statusWord_ = 0; return this; } @@ -450,6 +528,7 @@ public final class StubDispenserResponseOuterClass { result.dispenserPosition_ = dispenserPosition_; result.inkWorningLevel_ = inkWorningLevel_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -500,8 +579,12 @@ public final class StubDispenserResponseOuterClass { if (other.getInkWorningLevel() != 0) { setInkWorningLevel(other.getInkWorningLevel()); } - if (other.getStatus() != false) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -641,40 +724,129 @@ public final class StubDispenserResponseOuterClass { return this; } - private boolean status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 4;</code> + * <code>string Status = 4;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 4;</code> + * <code>string Status = 4;</code> */ - public Builder setStatus(boolean value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 4;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 4;</code> + * <code>string Status = 4;</code> */ public Builder clearStatus() { - status_ = false; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 4;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 5;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 5;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 5;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -742,10 +914,11 @@ public final class StubDispenserResponseOuterClass { static { java.lang.String[] descriptorData = { "\n\033StubDispenserResponse.proto\022\017Tango.PMR" + - ".Stubs\"p\n\025StubDispenserResponse\022\023\n\013Dispe" + - "nserId\030\001 \001(\r\022\031\n\021DispenserPosition\030\002 \001(\r\022" + - "\027\n\017InkWorningLevel\030\003 \001(\r\022\016\n\006Status\030\004 \001(\010" + - "B\033\n\031com.twine.tango.pmr.stubsb\006proto3" + ".Stubs\"\204\001\n\025StubDispenserResponse\022\023\n\013Disp" + + "enserId\030\001 \001(\r\022\031\n\021DispenserPosition\030\002 \001(\r" + + "\022\027\n\017InkWorningLevel\030\003 \001(\r\022\016\n\006Status\030\004 \001(" + + "\t\022\022\n\nStatusWord\030\005 \001(\rB\033\n\031com.twine.tango" + + ".pmr.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -764,7 +937,7 @@ public final class StubDispenserResponseOuterClass { internal_static_Tango_PMR_Stubs_StubDispenserResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubDispenserResponse_descriptor, - new java.lang.String[] { "DispenserId", "DispenserPosition", "InkWorningLevel", "Status", }); + new java.lang.String[] { "DispenserId", "DispenserPosition", "InkWorningLevel", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadRequestOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadRequestOuterClass.java new file mode 100644 index 000000000..edc3d6737 --- /dev/null +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadRequestOuterClass.java @@ -0,0 +1,525 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: StubExtFlashReadRequest.proto + +package com.twine.tango.pmr.stubs; + +public final class StubExtFlashReadRequestOuterClass { + private StubExtFlashReadRequestOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface StubExtFlashReadRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:Tango.PMR.Stubs.StubExtFlashReadRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * <pre> + *Max 5 at this test + * </pre> + * + * <code>uint32 Number_Of_Words = 1;</code> + */ + int getNumberOfWords(); + } + /** + * Protobuf type {@code Tango.PMR.Stubs.StubExtFlashReadRequest} + */ + public static final class StubExtFlashReadRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:Tango.PMR.Stubs.StubExtFlashReadRequest) + StubExtFlashReadRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use StubExtFlashReadRequest.newBuilder() to construct. + private StubExtFlashReadRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) { + super(builder); + } + private StubExtFlashReadRequest() { + numberOfWords_ = 0; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private StubExtFlashReadRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + + numberOfWords_ = input.readUInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashReadRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashReadRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest.class, com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest.Builder.class); + } + + public static final int NUMBER_OF_WORDS_FIELD_NUMBER = 1; + private int numberOfWords_; + /** + * <pre> + *Max 5 at this test + * </pre> + * + * <code>uint32 Number_Of_Words = 1;</code> + */ + public int getNumberOfWords() { + return numberOfWords_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (numberOfWords_ != 0) { + output.writeUInt32(1, numberOfWords_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (numberOfWords_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(1, numberOfWords_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest)) { + return super.equals(obj); + } + com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest other = (com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest) obj; + + boolean result = true; + result = result && (getNumberOfWords() + == other.getNumberOfWords()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + NUMBER_OF_WORDS_FIELD_NUMBER; + hash = (53 * hash) + getNumberOfWords(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code Tango.PMR.Stubs.StubExtFlashReadRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements + // @@protoc_insertion_point(builder_implements:Tango.PMR.Stubs.StubExtFlashReadRequest) + com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashReadRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashReadRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest.class, com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest.Builder.class); + } + + // Construct using com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + numberOfWords_ = 0; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashReadRequest_descriptor; + } + + public com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest getDefaultInstanceForType() { + return com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest.getDefaultInstance(); + } + + public com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest build() { + com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest buildPartial() { + com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest result = new com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest(this); + result.numberOfWords_ = numberOfWords_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest) { + return mergeFrom((com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest other) { + if (other == com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest.getDefaultInstance()) return this; + if (other.getNumberOfWords() != 0) { + setNumberOfWords(other.getNumberOfWords()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + 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.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private int numberOfWords_ ; + /** + * <pre> + *Max 5 at this test + * </pre> + * + * <code>uint32 Number_Of_Words = 1;</code> + */ + public int getNumberOfWords() { + return numberOfWords_; + } + /** + * <pre> + *Max 5 at this test + * </pre> + * + * <code>uint32 Number_Of_Words = 1;</code> + */ + public Builder setNumberOfWords(int value) { + + numberOfWords_ = value; + onChanged(); + return this; + } + /** + * <pre> + *Max 5 at this test + * </pre> + * + * <code>uint32 Number_Of_Words = 1;</code> + */ + public Builder clearNumberOfWords() { + + numberOfWords_ = 0; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:Tango.PMR.Stubs.StubExtFlashReadRequest) + } + + // @@protoc_insertion_point(class_scope:Tango.PMR.Stubs.StubExtFlashReadRequest) + private static final com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest(); + } + + public static com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<StubExtFlashReadRequest> + PARSER = new com.google.protobuf.AbstractParser<StubExtFlashReadRequest>() { + public StubExtFlashReadRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new StubExtFlashReadRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser<StubExtFlashReadRequest> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<StubExtFlashReadRequest> getParserForType() { + return PARSER; + } + + public com.twine.tango.pmr.stubs.StubExtFlashReadRequestOuterClass.StubExtFlashReadRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_Tango_PMR_Stubs_StubExtFlashReadRequest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_Tango_PMR_Stubs_StubExtFlashReadRequest_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\035StubExtFlashReadRequest.proto\022\017Tango.P" + + "MR.Stubs\"2\n\027StubExtFlashReadRequest\022\027\n\017N" + + "umber_Of_Words\030\001 \001(\rB\033\n\031com.twine.tango." + + "pmr.stubsb\006proto3" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + internal_static_Tango_PMR_Stubs_StubExtFlashReadRequest_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_Tango_PMR_Stubs_StubExtFlashReadRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_Tango_PMR_Stubs_StubExtFlashReadRequest_descriptor, + new java.lang.String[] { "NumberOfWords", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadResponseOuterClass.java new file mode 100644 index 000000000..8db28fed5 --- /dev/null +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashReadResponseOuterClass.java @@ -0,0 +1,1091 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: StubExtFlashReadResponse.proto + +package com.twine.tango.pmr.stubs; + +public final class StubExtFlashReadResponseOuterClass { + private StubExtFlashReadResponseOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface StubExtFlashReadResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:Tango.PMR.Stubs.StubExtFlashReadResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_1 = 1;</code> + */ + int getReadWord1(); + + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_2 = 2;</code> + */ + int getReadWord2(); + + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_3 = 3;</code> + */ + int getReadWord3(); + + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_4 = 4;</code> + */ + int getReadWord4(); + + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_5 = 5;</code> + */ + int getReadWord5(); + + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 7;</code> + */ + int getStatusWord(); + } + /** + * Protobuf type {@code Tango.PMR.Stubs.StubExtFlashReadResponse} + */ + public static final class StubExtFlashReadResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:Tango.PMR.Stubs.StubExtFlashReadResponse) + StubExtFlashReadResponseOrBuilder { + private static final long serialVersionUID = 0L; + // Use StubExtFlashReadResponse.newBuilder() to construct. + private StubExtFlashReadResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) { + super(builder); + } + private StubExtFlashReadResponse() { + readWord1_ = 0; + readWord2_ = 0; + readWord3_ = 0; + readWord4_ = 0; + readWord5_ = 0; + status_ = ""; + statusWord_ = 0; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private StubExtFlashReadResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + + readWord1_ = input.readInt32(); + break; + } + case 16: { + + readWord2_ = input.readInt32(); + break; + } + case 24: { + + readWord3_ = input.readInt32(); + break; + } + case 32: { + + readWord4_ = input.readInt32(); + break; + } + case 40: { + + readWord5_ = input.readInt32(); + break; + } + case 50: { + java.lang.String s = input.readStringRequireUtf8(); + + status_ = s; + break; + } + case 56: { + + statusWord_ = input.readUInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashReadResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashReadResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse.class, com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse.Builder.class); + } + + public static final int READWORD_1_FIELD_NUMBER = 1; + private int readWord1_; + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_1 = 1;</code> + */ + public int getReadWord1() { + return readWord1_; + } + + public static final int READWORD_2_FIELD_NUMBER = 2; + private int readWord2_; + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_2 = 2;</code> + */ + public int getReadWord2() { + return readWord2_; + } + + public static final int READWORD_3_FIELD_NUMBER = 3; + private int readWord3_; + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_3 = 3;</code> + */ + public int getReadWord3() { + return readWord3_; + } + + public static final int READWORD_4_FIELD_NUMBER = 4; + private int readWord4_; + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_4 = 4;</code> + */ + public int getReadWord4() { + return readWord4_; + } + + public static final int READWORD_5_FIELD_NUMBER = 5; + private int readWord5_; + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_5 = 5;</code> + */ + public int getReadWord5() { + return readWord5_; + } + + public static final int STATUS_FIELD_NUMBER = 6; + private volatile java.lang.Object status_; + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 7; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 7;</code> + */ + public int getStatusWord() { + return statusWord_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (readWord1_ != 0) { + output.writeInt32(1, readWord1_); + } + if (readWord2_ != 0) { + output.writeInt32(2, readWord2_); + } + if (readWord3_ != 0) { + output.writeInt32(3, readWord3_); + } + if (readWord4_ != 0) { + output.writeInt32(4, readWord4_); + } + if (readWord5_ != 0) { + output.writeInt32(5, readWord5_); + } + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 6, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(7, statusWord_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (readWord1_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, readWord1_); + } + if (readWord2_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, readWord2_); + } + if (readWord3_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, readWord3_); + } + if (readWord4_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, readWord4_); + } + if (readWord5_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, readWord5_); + } + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(6, status_); + } + if (statusWord_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(7, statusWord_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse)) { + return super.equals(obj); + } + com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse other = (com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse) obj; + + boolean result = true; + result = result && (getReadWord1() + == other.getReadWord1()); + result = result && (getReadWord2() + == other.getReadWord2()); + result = result && (getReadWord3() + == other.getReadWord3()); + result = result && (getReadWord4() + == other.getReadWord4()); + result = result && (getReadWord5() + == other.getReadWord5()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + READWORD_1_FIELD_NUMBER; + hash = (53 * hash) + getReadWord1(); + hash = (37 * hash) + READWORD_2_FIELD_NUMBER; + hash = (53 * hash) + getReadWord2(); + hash = (37 * hash) + READWORD_3_FIELD_NUMBER; + hash = (53 * hash) + getReadWord3(); + hash = (37 * hash) + READWORD_4_FIELD_NUMBER; + hash = (53 * hash) + getReadWord4(); + hash = (37 * hash) + READWORD_5_FIELD_NUMBER; + hash = (53 * hash) + getReadWord5(); + hash = (37 * hash) + STATUS_FIELD_NUMBER; + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code Tango.PMR.Stubs.StubExtFlashReadResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements + // @@protoc_insertion_point(builder_implements:Tango.PMR.Stubs.StubExtFlashReadResponse) + com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashReadResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashReadResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse.class, com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse.Builder.class); + } + + // Construct using com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + readWord1_ = 0; + + readWord2_ = 0; + + readWord3_ = 0; + + readWord4_ = 0; + + readWord5_ = 0; + + status_ = ""; + + statusWord_ = 0; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashReadResponse_descriptor; + } + + public com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse getDefaultInstanceForType() { + return com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse.getDefaultInstance(); + } + + public com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse build() { + com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse buildPartial() { + com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse result = new com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse(this); + result.readWord1_ = readWord1_; + result.readWord2_ = readWord2_; + result.readWord3_ = readWord3_; + result.readWord4_ = readWord4_; + result.readWord5_ = readWord5_; + result.status_ = status_; + result.statusWord_ = statusWord_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse) { + return mergeFrom((com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse other) { + if (other == com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse.getDefaultInstance()) return this; + if (other.getReadWord1() != 0) { + setReadWord1(other.getReadWord1()); + } + if (other.getReadWord2() != 0) { + setReadWord2(other.getReadWord2()); + } + if (other.getReadWord3() != 0) { + setReadWord3(other.getReadWord3()); + } + if (other.getReadWord4() != 0) { + setReadWord4(other.getReadWord4()); + } + if (other.getReadWord5() != 0) { + setReadWord5(other.getReadWord5()); + } + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + 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.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private int readWord1_ ; + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_1 = 1;</code> + */ + public int getReadWord1() { + return readWord1_; + } + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_1 = 1;</code> + */ + public Builder setReadWord1(int value) { + + readWord1_ = value; + onChanged(); + return this; + } + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_1 = 1;</code> + */ + public Builder clearReadWord1() { + + readWord1_ = 0; + onChanged(); + return this; + } + + private int readWord2_ ; + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_2 = 2;</code> + */ + public int getReadWord2() { + return readWord2_; + } + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_2 = 2;</code> + */ + public Builder setReadWord2(int value) { + + readWord2_ = value; + onChanged(); + return this; + } + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_2 = 2;</code> + */ + public Builder clearReadWord2() { + + readWord2_ = 0; + onChanged(); + return this; + } + + private int readWord3_ ; + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_3 = 3;</code> + */ + public int getReadWord3() { + return readWord3_; + } + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_3 = 3;</code> + */ + public Builder setReadWord3(int value) { + + readWord3_ = value; + onChanged(); + return this; + } + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_3 = 3;</code> + */ + public Builder clearReadWord3() { + + readWord3_ = 0; + onChanged(); + return this; + } + + private int readWord4_ ; + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_4 = 4;</code> + */ + public int getReadWord4() { + return readWord4_; + } + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_4 = 4;</code> + */ + public Builder setReadWord4(int value) { + + readWord4_ = value; + onChanged(); + return this; + } + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_4 = 4;</code> + */ + public Builder clearReadWord4() { + + readWord4_ = 0; + onChanged(); + return this; + } + + private int readWord5_ ; + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_5 = 5;</code> + */ + public int getReadWord5() { + return readWord5_; + } + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_5 = 5;</code> + */ + public Builder setReadWord5(int value) { + + readWord5_ = value; + onChanged(); + return this; + } + /** + * <pre> + * </pre> + * + * <code>int32 ReadWord_5 = 5;</code> + */ + public Builder clearReadWord5() { + + readWord5_ = 0; + onChanged(); + return this; + } + + private java.lang.Object status_ = ""; + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + status_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public Builder clearStatus() { + + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 6;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 7;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 7;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 7;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:Tango.PMR.Stubs.StubExtFlashReadResponse) + } + + // @@protoc_insertion_point(class_scope:Tango.PMR.Stubs.StubExtFlashReadResponse) + private static final com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse(); + } + + public static com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<StubExtFlashReadResponse> + PARSER = new com.google.protobuf.AbstractParser<StubExtFlashReadResponse>() { + public StubExtFlashReadResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new StubExtFlashReadResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser<StubExtFlashReadResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<StubExtFlashReadResponse> getParserForType() { + return PARSER; + } + + public com.twine.tango.pmr.stubs.StubExtFlashReadResponseOuterClass.StubExtFlashReadResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_Tango_PMR_Stubs_StubExtFlashReadResponse_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_Tango_PMR_Stubs_StubExtFlashReadResponse_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\036StubExtFlashReadResponse.proto\022\017Tango." + + "PMR.Stubs\"\242\001\n\030StubExtFlashReadResponse\022\022" + + "\n\nReadWord_1\030\001 \001(\005\022\022\n\nReadWord_2\030\002 \001(\005\022\022" + + "\n\nReadWord_3\030\003 \001(\005\022\022\n\nReadWord_4\030\004 \001(\005\022\022" + + "\n\nReadWord_5\030\005 \001(\005\022\016\n\006Status\030\006 \001(\t\022\022\n\nSt" + + "atusWord\030\007 \001(\rB\033\n\031com.twine.tango.pmr.st" + + "ubsb\006proto3" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + internal_static_Tango_PMR_Stubs_StubExtFlashReadResponse_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_Tango_PMR_Stubs_StubExtFlashReadResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_Tango_PMR_Stubs_StubExtFlashReadResponse_descriptor, + new java.lang.String[] { "ReadWord1", "ReadWord2", "ReadWord3", "ReadWord4", "ReadWord5", "Status", "StatusWord", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteRequestOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteRequestOuterClass.java new file mode 100644 index 000000000..9f706c4bb --- /dev/null +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteRequestOuterClass.java @@ -0,0 +1,859 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: StubExtFlashWriteRequest.proto + +package com.twine.tango.pmr.stubs; + +public final class StubExtFlashWriteRequestOuterClass { + private StubExtFlashWriteRequestOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface StubExtFlashWriteRequestOrBuilder extends + // @@protoc_insertion_point(interface_extends:Tango.PMR.Stubs.StubExtFlashWriteRequest) + com.google.protobuf.MessageOrBuilder { + + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite1 = 1;</code> + */ + int getWordToWrite1(); + + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite2 = 2;</code> + */ + int getWordToWrite2(); + + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite3 = 3;</code> + */ + int getWordToWrite3(); + + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite4 = 4;</code> + */ + int getWordToWrite4(); + + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite5 = 5;</code> + */ + int getWordToWrite5(); + } + /** + * Protobuf type {@code Tango.PMR.Stubs.StubExtFlashWriteRequest} + */ + public static final class StubExtFlashWriteRequest extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:Tango.PMR.Stubs.StubExtFlashWriteRequest) + StubExtFlashWriteRequestOrBuilder { + private static final long serialVersionUID = 0L; + // Use StubExtFlashWriteRequest.newBuilder() to construct. + private StubExtFlashWriteRequest(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) { + super(builder); + } + private StubExtFlashWriteRequest() { + wordToWrite1_ = 0; + wordToWrite2_ = 0; + wordToWrite3_ = 0; + wordToWrite4_ = 0; + wordToWrite5_ = 0; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private StubExtFlashWriteRequest( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + + wordToWrite1_ = input.readInt32(); + break; + } + case 16: { + + wordToWrite2_ = input.readInt32(); + break; + } + case 24: { + + wordToWrite3_ = input.readInt32(); + break; + } + case 32: { + + wordToWrite4_ = input.readInt32(); + break; + } + case 40: { + + wordToWrite5_ = input.readInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashWriteRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashWriteRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest.class, com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest.Builder.class); + } + + public static final int WORDTOWRITE1_FIELD_NUMBER = 1; + private int wordToWrite1_; + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite1 = 1;</code> + */ + public int getWordToWrite1() { + return wordToWrite1_; + } + + public static final int WORDTOWRITE2_FIELD_NUMBER = 2; + private int wordToWrite2_; + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite2 = 2;</code> + */ + public int getWordToWrite2() { + return wordToWrite2_; + } + + public static final int WORDTOWRITE3_FIELD_NUMBER = 3; + private int wordToWrite3_; + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite3 = 3;</code> + */ + public int getWordToWrite3() { + return wordToWrite3_; + } + + public static final int WORDTOWRITE4_FIELD_NUMBER = 4; + private int wordToWrite4_; + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite4 = 4;</code> + */ + public int getWordToWrite4() { + return wordToWrite4_; + } + + public static final int WORDTOWRITE5_FIELD_NUMBER = 5; + private int wordToWrite5_; + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite5 = 5;</code> + */ + public int getWordToWrite5() { + return wordToWrite5_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (wordToWrite1_ != 0) { + output.writeInt32(1, wordToWrite1_); + } + if (wordToWrite2_ != 0) { + output.writeInt32(2, wordToWrite2_); + } + if (wordToWrite3_ != 0) { + output.writeInt32(3, wordToWrite3_); + } + if (wordToWrite4_ != 0) { + output.writeInt32(4, wordToWrite4_); + } + if (wordToWrite5_ != 0) { + output.writeInt32(5, wordToWrite5_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (wordToWrite1_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, wordToWrite1_); + } + if (wordToWrite2_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, wordToWrite2_); + } + if (wordToWrite3_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, wordToWrite3_); + } + if (wordToWrite4_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(4, wordToWrite4_); + } + if (wordToWrite5_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(5, wordToWrite5_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest)) { + return super.equals(obj); + } + com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest other = (com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest) obj; + + boolean result = true; + result = result && (getWordToWrite1() + == other.getWordToWrite1()); + result = result && (getWordToWrite2() + == other.getWordToWrite2()); + result = result && (getWordToWrite3() + == other.getWordToWrite3()); + result = result && (getWordToWrite4() + == other.getWordToWrite4()); + result = result && (getWordToWrite5() + == other.getWordToWrite5()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + WORDTOWRITE1_FIELD_NUMBER; + hash = (53 * hash) + getWordToWrite1(); + hash = (37 * hash) + WORDTOWRITE2_FIELD_NUMBER; + hash = (53 * hash) + getWordToWrite2(); + hash = (37 * hash) + WORDTOWRITE3_FIELD_NUMBER; + hash = (53 * hash) + getWordToWrite3(); + hash = (37 * hash) + WORDTOWRITE4_FIELD_NUMBER; + hash = (53 * hash) + getWordToWrite4(); + hash = (37 * hash) + WORDTOWRITE5_FIELD_NUMBER; + hash = (53 * hash) + getWordToWrite5(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code Tango.PMR.Stubs.StubExtFlashWriteRequest} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements + // @@protoc_insertion_point(builder_implements:Tango.PMR.Stubs.StubExtFlashWriteRequest) + com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequestOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashWriteRequest_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashWriteRequest_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest.class, com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest.Builder.class); + } + + // Construct using com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + wordToWrite1_ = 0; + + wordToWrite2_ = 0; + + wordToWrite3_ = 0; + + wordToWrite4_ = 0; + + wordToWrite5_ = 0; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashWriteRequest_descriptor; + } + + public com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest getDefaultInstanceForType() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest.getDefaultInstance(); + } + + public com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest build() { + com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest buildPartial() { + com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest result = new com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest(this); + result.wordToWrite1_ = wordToWrite1_; + result.wordToWrite2_ = wordToWrite2_; + result.wordToWrite3_ = wordToWrite3_; + result.wordToWrite4_ = wordToWrite4_; + result.wordToWrite5_ = wordToWrite5_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest) { + return mergeFrom((com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest other) { + if (other == com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest.getDefaultInstance()) return this; + if (other.getWordToWrite1() != 0) { + setWordToWrite1(other.getWordToWrite1()); + } + if (other.getWordToWrite2() != 0) { + setWordToWrite2(other.getWordToWrite2()); + } + if (other.getWordToWrite3() != 0) { + setWordToWrite3(other.getWordToWrite3()); + } + if (other.getWordToWrite4() != 0) { + setWordToWrite4(other.getWordToWrite4()); + } + if (other.getWordToWrite5() != 0) { + setWordToWrite5(other.getWordToWrite5()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + 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.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private int wordToWrite1_ ; + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite1 = 1;</code> + */ + public int getWordToWrite1() { + return wordToWrite1_; + } + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite1 = 1;</code> + */ + public Builder setWordToWrite1(int value) { + + wordToWrite1_ = value; + onChanged(); + return this; + } + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite1 = 1;</code> + */ + public Builder clearWordToWrite1() { + + wordToWrite1_ = 0; + onChanged(); + return this; + } + + private int wordToWrite2_ ; + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite2 = 2;</code> + */ + public int getWordToWrite2() { + return wordToWrite2_; + } + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite2 = 2;</code> + */ + public Builder setWordToWrite2(int value) { + + wordToWrite2_ = value; + onChanged(); + return this; + } + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite2 = 2;</code> + */ + public Builder clearWordToWrite2() { + + wordToWrite2_ = 0; + onChanged(); + return this; + } + + private int wordToWrite3_ ; + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite3 = 3;</code> + */ + public int getWordToWrite3() { + return wordToWrite3_; + } + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite3 = 3;</code> + */ + public Builder setWordToWrite3(int value) { + + wordToWrite3_ = value; + onChanged(); + return this; + } + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite3 = 3;</code> + */ + public Builder clearWordToWrite3() { + + wordToWrite3_ = 0; + onChanged(); + return this; + } + + private int wordToWrite4_ ; + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite4 = 4;</code> + */ + public int getWordToWrite4() { + return wordToWrite4_; + } + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite4 = 4;</code> + */ + public Builder setWordToWrite4(int value) { + + wordToWrite4_ = value; + onChanged(); + return this; + } + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite4 = 4;</code> + */ + public Builder clearWordToWrite4() { + + wordToWrite4_ = 0; + onChanged(); + return this; + } + + private int wordToWrite5_ ; + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite5 = 5;</code> + */ + public int getWordToWrite5() { + return wordToWrite5_; + } + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite5 = 5;</code> + */ + public Builder setWordToWrite5(int value) { + + wordToWrite5_ = value; + onChanged(); + return this; + } + /** + * <pre> + *0..255 + * </pre> + * + * <code>int32 WordToWrite5 = 5;</code> + */ + public Builder clearWordToWrite5() { + + wordToWrite5_ = 0; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:Tango.PMR.Stubs.StubExtFlashWriteRequest) + } + + // @@protoc_insertion_point(class_scope:Tango.PMR.Stubs.StubExtFlashWriteRequest) + private static final com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest(); + } + + public static com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<StubExtFlashWriteRequest> + PARSER = new com.google.protobuf.AbstractParser<StubExtFlashWriteRequest>() { + public StubExtFlashWriteRequest parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new StubExtFlashWriteRequest(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser<StubExtFlashWriteRequest> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<StubExtFlashWriteRequest> getParserForType() { + return PARSER; + } + + public com.twine.tango.pmr.stubs.StubExtFlashWriteRequestOuterClass.StubExtFlashWriteRequest getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_Tango_PMR_Stubs_StubExtFlashWriteRequest_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_Tango_PMR_Stubs_StubExtFlashWriteRequest_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\036StubExtFlashWriteRequest.proto\022\017Tango." + + "PMR.Stubs\"\210\001\n\030StubExtFlashWriteRequest\022\024" + + "\n\014WordToWrite1\030\001 \001(\005\022\024\n\014WordToWrite2\030\002 \001" + + "(\005\022\024\n\014WordToWrite3\030\003 \001(\005\022\024\n\014WordToWrite4" + + "\030\004 \001(\005\022\024\n\014WordToWrite5\030\005 \001(\005B\033\n\031com.twin" + + "e.tango.pmr.stubsb\006proto3" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + internal_static_Tango_PMR_Stubs_StubExtFlashWriteRequest_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_Tango_PMR_Stubs_StubExtFlashWriteRequest_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_Tango_PMR_Stubs_StubExtFlashWriteRequest_descriptor, + new java.lang.String[] { "WordToWrite1", "WordToWrite2", "WordToWrite3", "WordToWrite4", "WordToWrite5", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteResponseOuterClass.java new file mode 100644 index 000000000..a2cf9fbd0 --- /dev/null +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubExtFlashWriteResponseOuterClass.java @@ -0,0 +1,698 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: StubExtFlashWriteResponse.proto + +package com.twine.tango.pmr.stubs; + +public final class StubExtFlashWriteResponseOuterClass { + private StubExtFlashWriteResponseOuterClass() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface StubExtFlashWriteResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:Tango.PMR.Stubs.StubExtFlashWriteResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 2;</code> + */ + int getStatusWord(); + } + /** + * Protobuf type {@code Tango.PMR.Stubs.StubExtFlashWriteResponse} + */ + public static final class StubExtFlashWriteResponse extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:Tango.PMR.Stubs.StubExtFlashWriteResponse) + StubExtFlashWriteResponseOrBuilder { + private static final long serialVersionUID = 0L; + // Use StubExtFlashWriteResponse.newBuilder() to construct. + private StubExtFlashWriteResponse(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) { + super(builder); + } + private StubExtFlashWriteResponse() { + status_ = ""; + statusWord_ = 0; + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private StubExtFlashWriteResponse( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + java.lang.String s = input.readStringRequireUtf8(); + + status_ = s; + break; + } + case 16: { + + statusWord_ = input.readUInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashWriteResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashWriteResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse.class, com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse.Builder.class); + } + + public static final int STATUS_FIELD_NUMBER = 1; + private volatile java.lang.Object status_; + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 2; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 2;</code> + */ + public int getStatusWord() { + return statusWord_; + } + + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(2, statusWord_); + } + unknownFields.writeTo(output); + } + + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, status_); + } + if (statusWord_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeUInt32Size(2, statusWord_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse)) { + return super.equals(obj); + } + com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse other = (com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse) obj; + + boolean result = true; + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + STATUS_FIELD_NUMBER; + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code Tango.PMR.Stubs.StubExtFlashWriteResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements + // @@protoc_insertion_point(builder_implements:Tango.PMR.Stubs.StubExtFlashWriteResponse) + com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashWriteResponse_descriptor; + } + + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashWriteResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse.class, com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse.Builder.class); + } + + // Construct using com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + public Builder clear() { + super.clear(); + status_ = ""; + + statusWord_ = 0; + + return this; + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.internal_static_Tango_PMR_Stubs_StubExtFlashWriteResponse_descriptor; + } + + public com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse getDefaultInstanceForType() { + return com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse.getDefaultInstance(); + } + + public com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse build() { + com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse buildPartial() { + com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse result = new com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse(this); + result.status_ = status_; + result.statusWord_ = statusWord_; + onBuilt(); + return result; + } + + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return (Builder) super.addRepeatedField(field, value); + } + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse) { + return mergeFrom((com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse other) { + if (other == com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse.getDefaultInstance()) return this; + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + 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.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private java.lang.Object status_ = ""; + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + status_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + public Builder clearStatus() { + + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 2;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 2;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 2;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; + onChanged(); + return this; + } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFieldsProto3(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:Tango.PMR.Stubs.StubExtFlashWriteResponse) + } + + // @@protoc_insertion_point(class_scope:Tango.PMR.Stubs.StubExtFlashWriteResponse) + private static final com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse(); + } + + public static com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser<StubExtFlashWriteResponse> + PARSER = new com.google.protobuf.AbstractParser<StubExtFlashWriteResponse>() { + public StubExtFlashWriteResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new StubExtFlashWriteResponse(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser<StubExtFlashWriteResponse> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<StubExtFlashWriteResponse> getParserForType() { + return PARSER; + } + + public com.twine.tango.pmr.stubs.StubExtFlashWriteResponseOuterClass.StubExtFlashWriteResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_Tango_PMR_Stubs_StubExtFlashWriteResponse_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_Tango_PMR_Stubs_StubExtFlashWriteResponse_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\037StubExtFlashWriteResponse.proto\022\017Tango" + + ".PMR.Stubs\"?\n\031StubExtFlashWriteResponse\022" + + "\016\n\006Status\030\001 \001(\t\022\022\n\nStatusWord\030\002 \001(\rB\033\n\031c" + + "om.twine.tango.pmr.stubsb\006proto3" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + internal_static_Tango_PMR_Stubs_StubExtFlashWriteResponse_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_Tango_PMR_Stubs_StubExtFlashWriteResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_Tango_PMR_Stubs_StubExtFlashWriteResponse_descriptor, + new java.lang.String[] { "Status", "StatusWord", }); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupResponseOuterClass.java index 41089165c..9a697772e 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOInputSetupResponseOuterClass.java @@ -47,12 +47,30 @@ public final class StubGPIOInputSetupResponseOuterClass { /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 3;</code> + * <code>string Status = 3;</code> */ - int getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubGPIOInputSetupResponse} @@ -69,7 +87,8 @@ public final class StubGPIOInputSetupResponseOuterClass { private StubGPIOInputSetupResponse() { portId_ = ""; pinId_ = 0; - status_ = 0; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -111,9 +130,15 @@ public final class StubGPIOInputSetupResponseOuterClass { pinId_ = input.readUInt32(); break; } - case 24: { + case 26: { + java.lang.String s = input.readStringRequireUtf8(); + + status_ = s; + break; + } + case 32: { - status_ = input.readUInt32(); + statusWord_ = input.readUInt32(); break; } } @@ -196,16 +221,58 @@ public final class StubGPIOInputSetupResponseOuterClass { } public static final int STATUS_FIELD_NUMBER = 3; - private int status_; + private volatile java.lang.Object status_; + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 3;</code> + * <code>string Status = 3;</code> */ - public int getStatus() { - return status_; + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 4; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -226,8 +293,11 @@ public final class StubGPIOInputSetupResponseOuterClass { if (pinId_ != 0) { output.writeUInt32(2, pinId_); } - if (status_ != 0) { - output.writeUInt32(3, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(4, statusWord_); } unknownFields.writeTo(output); } @@ -244,9 +314,12 @@ public final class StubGPIOInputSetupResponseOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(2, pinId_); } - if (status_ != 0) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, status_); + .computeUInt32Size(4, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -268,8 +341,10 @@ public final class StubGPIOInputSetupResponseOuterClass { .equals(other.getPortId()); result = result && (getPinId() == other.getPinId()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -286,7 +361,9 @@ public final class StubGPIOInputSetupResponseOuterClass { hash = (37 * hash) + PINID_FIELD_NUMBER; hash = (53 * hash) + getPinId(); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + getStatus(); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -420,7 +497,9 @@ public final class StubGPIOInputSetupResponseOuterClass { pinId_ = 0; - status_ = 0; + status_ = ""; + + statusWord_ = 0; return this; } @@ -447,6 +526,7 @@ public final class StubGPIOInputSetupResponseOuterClass { result.portId_ = portId_; result.pinId_ = pinId_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -495,8 +575,12 @@ public final class StubGPIOInputSetupResponseOuterClass { if (other.getPinId() != 0) { setPinId(other.getPinId()); } - if (other.getStatus() != 0) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -652,40 +736,129 @@ public final class StubGPIOInputSetupResponseOuterClass { return this; } - private int status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 3;</code> + * <code>string Status = 3;</code> */ - public int getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 3;</code> + * <code>string Status = 3;</code> */ - public Builder setStatus(int value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 3;</code> + * <code>string Status = 3;</code> */ public Builder clearStatus() { - status_ = 0; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -753,10 +926,10 @@ public final class StubGPIOInputSetupResponseOuterClass { static { java.lang.String[] descriptorData = { "\n StubGPIOInputSetupResponse.proto\022\017Tang" + - "o.PMR.Stubs\"K\n\032StubGPIOInputSetupRespons" + + "o.PMR.Stubs\"_\n\032StubGPIOInputSetupRespons" + "e\022\016\n\006PortId\030\001 \001(\t\022\r\n\005PinId\030\002 \001(\r\022\016\n\006Stat" + - "us\030\003 \001(\rB\033\n\031com.twine.tango.pmr.stubsb\006p" + - "roto3" + "us\030\003 \001(\t\022\022\n\nStatusWord\030\004 \001(\rB\033\n\031com.twin" + + "e.tango.pmr.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -775,7 +948,7 @@ public final class StubGPIOInputSetupResponseOuterClass { internal_static_Tango_PMR_Stubs_StubGPIOInputSetupResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubGPIOInputSetupResponse_descriptor, - new java.lang.String[] { "PortId", "PinId", "Status", }); + new java.lang.String[] { "PortId", "PinId", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitResponseOuterClass.java index a7aa3fccb..4d1a944dc 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadBitResponseOuterClass.java @@ -52,12 +52,30 @@ public final class StubGPIOReadBitResponseOuterClass { /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 4;</code> + * <code>string Status = 4;</code> */ - int getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 4;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 5;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubGPIOReadBitResponse} @@ -75,7 +93,8 @@ public final class StubGPIOReadBitResponseOuterClass { portId_ = ""; pinId_ = 0; bitValue_ = false; - status_ = 0; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -122,9 +141,15 @@ public final class StubGPIOReadBitResponseOuterClass { bitValue_ = input.readBool(); break; } - case 32: { + case 34: { + java.lang.String s = input.readStringRequireUtf8(); + + status_ = s; + break; + } + case 40: { - status_ = input.readUInt32(); + statusWord_ = input.readUInt32(); break; } } @@ -216,16 +241,58 @@ public final class StubGPIOReadBitResponseOuterClass { } public static final int STATUS_FIELD_NUMBER = 4; - private int status_; + private volatile java.lang.Object status_; + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 4;</code> + */ + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 4;</code> + * <code>string Status = 4;</code> */ - public int getStatus() { - return status_; + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 5; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 5;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -249,8 +316,11 @@ public final class StubGPIOReadBitResponseOuterClass { if (bitValue_ != false) { output.writeBool(3, bitValue_); } - if (status_ != 0) { - output.writeUInt32(4, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 4, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(5, statusWord_); } unknownFields.writeTo(output); } @@ -271,9 +341,12 @@ public final class StubGPIOReadBitResponseOuterClass { size += com.google.protobuf.CodedOutputStream .computeBoolSize(3, bitValue_); } - if (status_ != 0) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(4, status_); + .computeUInt32Size(5, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -297,8 +370,10 @@ public final class StubGPIOReadBitResponseOuterClass { == other.getPinId()); result = result && (getBitValue() == other.getBitValue()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -318,7 +393,9 @@ public final class StubGPIOReadBitResponseOuterClass { hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getBitValue()); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + getStatus(); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -454,7 +531,9 @@ public final class StubGPIOReadBitResponseOuterClass { bitValue_ = false; - status_ = 0; + status_ = ""; + + statusWord_ = 0; return this; } @@ -482,6 +561,7 @@ public final class StubGPIOReadBitResponseOuterClass { result.pinId_ = pinId_; result.bitValue_ = bitValue_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -533,8 +613,12 @@ public final class StubGPIOReadBitResponseOuterClass { if (other.getBitValue() != false) { setBitValue(other.getBitValue()); } - if (other.getStatus() != 0) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -716,40 +800,129 @@ public final class StubGPIOReadBitResponseOuterClass { return this; } - private int status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 4;</code> + * <code>string Status = 4;</code> */ - public int getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 4;</code> + * <code>string Status = 4;</code> */ - public Builder setStatus(int value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 4;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 4;</code> + * <code>string Status = 4;</code> */ public Builder clearStatus() { - status_ = 0; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 4;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 5;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 5;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 5;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -817,10 +990,10 @@ public final class StubGPIOReadBitResponseOuterClass { static { java.lang.String[] descriptorData = { "\n\035StubGPIOReadBitResponse.proto\022\017Tango.P" + - "MR.Stubs\"Z\n\027StubGPIOReadBitResponse\022\016\n\006P" + + "MR.Stubs\"n\n\027StubGPIOReadBitResponse\022\016\n\006P" + "ortId\030\001 \001(\t\022\r\n\005PinId\030\002 \001(\r\022\020\n\010BitValue\030\003" + - " \001(\010\022\016\n\006Status\030\004 \001(\rB\033\n\031com.twine.tango." + - "pmr.stubsb\006proto3" + " \001(\010\022\016\n\006Status\030\004 \001(\t\022\022\n\nStatusWord\030\005 \001(\r" + + "B\033\n\031com.twine.tango.pmr.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -839,7 +1012,7 @@ public final class StubGPIOReadBitResponseOuterClass { internal_static_Tango_PMR_Stubs_StubGPIOReadBitResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubGPIOReadBitResponse_descriptor, - new java.lang.String[] { "PortId", "PinId", "BitValue", "Status", }); + new java.lang.String[] { "PortId", "PinId", "BitValue", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteResponseOuterClass.java index d581bae2a..abddb9fc5 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOReadByteResponseOuterClass.java @@ -43,12 +43,30 @@ public final class StubGPIOReadByteResponseOuterClass { /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 status = 3;</code> + * <code>string Status = 3;</code> */ - int getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubGPIOReadByteResponse} @@ -65,7 +83,8 @@ public final class StubGPIOReadByteResponseOuterClass { private StubGPIOReadByteResponse() { portId_ = ""; byteValue_ = 0; - status_ = 0; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -107,9 +126,15 @@ public final class StubGPIOReadByteResponseOuterClass { byteValue_ = input.readUInt32(); break; } - case 24: { + case 26: { + java.lang.String s = input.readStringRequireUtf8(); + + status_ = s; + break; + } + case 32: { - status_ = input.readUInt32(); + statusWord_ = input.readUInt32(); break; } } @@ -188,16 +213,58 @@ public final class StubGPIOReadByteResponseOuterClass { } public static final int STATUS_FIELD_NUMBER = 3; - private int status_; + private volatile java.lang.Object status_; + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 status = 3;</code> + * <code>string Status = 3;</code> */ - public int getStatus() { - return status_; + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 4; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -218,8 +285,11 @@ public final class StubGPIOReadByteResponseOuterClass { if (byteValue_ != 0) { output.writeUInt32(2, byteValue_); } - if (status_ != 0) { - output.writeUInt32(3, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(4, statusWord_); } unknownFields.writeTo(output); } @@ -236,9 +306,12 @@ public final class StubGPIOReadByteResponseOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(2, byteValue_); } - if (status_ != 0) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, status_); + .computeUInt32Size(4, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -260,8 +333,10 @@ public final class StubGPIOReadByteResponseOuterClass { .equals(other.getPortId()); result = result && (getByteValue() == other.getByteValue()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -278,7 +353,9 @@ public final class StubGPIOReadByteResponseOuterClass { hash = (37 * hash) + BYTEVALUE_FIELD_NUMBER; hash = (53 * hash) + getByteValue(); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + getStatus(); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -412,7 +489,9 @@ public final class StubGPIOReadByteResponseOuterClass { byteValue_ = 0; - status_ = 0; + status_ = ""; + + statusWord_ = 0; return this; } @@ -439,6 +518,7 @@ public final class StubGPIOReadByteResponseOuterClass { result.portId_ = portId_; result.byteValue_ = byteValue_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -487,8 +567,12 @@ public final class StubGPIOReadByteResponseOuterClass { if (other.getByteValue() != 0) { setByteValue(other.getByteValue()); } - if (other.getStatus() != 0) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -632,40 +716,129 @@ public final class StubGPIOReadByteResponseOuterClass { return this; } - private int status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 status = 3;</code> + * <code>string Status = 3;</code> */ - public int getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 status = 3;</code> + * <code>string Status = 3;</code> */ - public Builder setStatus(int value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 status = 3;</code> + * <code>string Status = 3;</code> */ public Builder clearStatus() { - status_ = 0; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -733,10 +906,10 @@ public final class StubGPIOReadByteResponseOuterClass { static { java.lang.String[] descriptorData = { "\n\036StubGPIOReadByteResponse.proto\022\017Tango." + - "PMR.Stubs\"M\n\030StubGPIOReadByteResponse\022\016\n" + - "\006PortId\030\001 \001(\t\022\021\n\tByteValue\030\002 \001(\r\022\016\n\006stat" + - "us\030\003 \001(\rB\033\n\031com.twine.tango.pmr.stubsb\006p" + - "roto3" + "PMR.Stubs\"a\n\030StubGPIOReadByteResponse\022\016\n" + + "\006PortId\030\001 \001(\t\022\021\n\tByteValue\030\002 \001(\r\022\016\n\006Stat" + + "us\030\003 \001(\t\022\022\n\nStatusWord\030\004 \001(\rB\033\n\031com.twin" + + "e.tango.pmr.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -755,7 +928,7 @@ public final class StubGPIOReadByteResponseOuterClass { internal_static_Tango_PMR_Stubs_StubGPIOReadByteResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubGPIOReadByteResponse_descriptor, - new java.lang.String[] { "PortId", "ByteValue", "Status", }); + new java.lang.String[] { "PortId", "ByteValue", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitResponseOuterClass.java index dc9544e4b..3dc0346be 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteBitResponseOuterClass.java @@ -47,12 +47,30 @@ public final class StubGPIOWriteBitResponseOuterClass { /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 3;</code> + * <code>string Status = 3;</code> */ - int getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubGPIOWriteBitResponse} @@ -69,7 +87,8 @@ public final class StubGPIOWriteBitResponseOuterClass { private StubGPIOWriteBitResponse() { portId_ = ""; pinId_ = 0; - status_ = 0; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -111,9 +130,15 @@ public final class StubGPIOWriteBitResponseOuterClass { pinId_ = input.readUInt32(); break; } - case 24: { + case 26: { + java.lang.String s = input.readStringRequireUtf8(); + + status_ = s; + break; + } + case 32: { - status_ = input.readUInt32(); + statusWord_ = input.readUInt32(); break; } } @@ -196,16 +221,58 @@ public final class StubGPIOWriteBitResponseOuterClass { } public static final int STATUS_FIELD_NUMBER = 3; - private int status_; + private volatile java.lang.Object status_; + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 3;</code> + * <code>string Status = 3;</code> */ - public int getStatus() { - return status_; + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 4; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -226,8 +293,11 @@ public final class StubGPIOWriteBitResponseOuterClass { if (pinId_ != 0) { output.writeUInt32(2, pinId_); } - if (status_ != 0) { - output.writeUInt32(3, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(4, statusWord_); } unknownFields.writeTo(output); } @@ -244,9 +314,12 @@ public final class StubGPIOWriteBitResponseOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(2, pinId_); } - if (status_ != 0) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, status_); + .computeUInt32Size(4, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -268,8 +341,10 @@ public final class StubGPIOWriteBitResponseOuterClass { .equals(other.getPortId()); result = result && (getPinId() == other.getPinId()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -286,7 +361,9 @@ public final class StubGPIOWriteBitResponseOuterClass { hash = (37 * hash) + PINID_FIELD_NUMBER; hash = (53 * hash) + getPinId(); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + getStatus(); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -420,7 +497,9 @@ public final class StubGPIOWriteBitResponseOuterClass { pinId_ = 0; - status_ = 0; + status_ = ""; + + statusWord_ = 0; return this; } @@ -447,6 +526,7 @@ public final class StubGPIOWriteBitResponseOuterClass { result.portId_ = portId_; result.pinId_ = pinId_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -495,8 +575,12 @@ public final class StubGPIOWriteBitResponseOuterClass { if (other.getPinId() != 0) { setPinId(other.getPinId()); } - if (other.getStatus() != 0) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -652,40 +736,129 @@ public final class StubGPIOWriteBitResponseOuterClass { return this; } - private int status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 3;</code> + * <code>string Status = 3;</code> */ - public int getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 3;</code> + * <code>string Status = 3;</code> */ - public Builder setStatus(int value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 Status = 3;</code> + * <code>string Status = 3;</code> */ public Builder clearStatus() { - status_ = 0; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -753,10 +926,10 @@ public final class StubGPIOWriteBitResponseOuterClass { static { java.lang.String[] descriptorData = { "\n\036StubGPIOWriteBitResponse.proto\022\017Tango." + - "PMR.Stubs\"I\n\030StubGPIOWriteBitResponse\022\016\n" + + "PMR.Stubs\"]\n\030StubGPIOWriteBitResponse\022\016\n" + "\006PortId\030\001 \001(\t\022\r\n\005PinId\030\002 \001(\r\022\016\n\006Status\030\003" + - " \001(\rB\033\n\031com.twine.tango.pmr.stubsb\006proto" + - "3" + " \001(\t\022\022\n\nStatusWord\030\004 \001(\rB\033\n\031com.twine.ta" + + "ngo.pmr.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -775,7 +948,7 @@ public final class StubGPIOWriteBitResponseOuterClass { internal_static_Tango_PMR_Stubs_StubGPIOWriteBitResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubGPIOWriteBitResponse_descriptor, - new java.lang.String[] { "PortId", "PinId", "Status", }); + new java.lang.String[] { "PortId", "PinId", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteResponseOuterClass.java index 9c7a5d626..ff5118301 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubGPIOWriteByteResponseOuterClass.java @@ -38,12 +38,30 @@ public final class StubGPIOWriteByteResponseOuterClass { /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 status = 3;</code> + * <code>string Status = 2;</code> */ - int getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 3;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubGPIOWriteByteResponse} @@ -59,7 +77,8 @@ public final class StubGPIOWriteByteResponseOuterClass { } private StubGPIOWriteByteResponse() { portId_ = ""; - status_ = 0; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -96,9 +115,15 @@ public final class StubGPIOWriteByteResponseOuterClass { portId_ = s; break; } + case 18: { + java.lang.String s = input.readStringRequireUtf8(); + + status_ = s; + break; + } case 24: { - status_ = input.readUInt32(); + statusWord_ = input.readUInt32(); break; } } @@ -167,17 +192,59 @@ public final class StubGPIOWriteByteResponseOuterClass { } } - public static final int STATUS_FIELD_NUMBER = 3; - private int status_; + public static final int STATUS_FIELD_NUMBER = 2; + private volatile java.lang.Object status_; + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> + */ + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 3; + private int statusWord_; /** * <pre> - * 0-OK 1-Failed + * Error number/bit when the status is Failed * </pre> * - * <code>uint32 status = 3;</code> + * <code>uint32 StatusWord = 3;</code> */ - public int getStatus() { - return status_; + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -195,8 +262,11 @@ public final class StubGPIOWriteByteResponseOuterClass { if (!getPortIdBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, portId_); } - if (status_ != 0) { - output.writeUInt32(3, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(3, statusWord_); } unknownFields.writeTo(output); } @@ -209,9 +279,12 @@ public final class StubGPIOWriteByteResponseOuterClass { if (!getPortIdBytes().isEmpty()) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, portId_); } - if (status_ != 0) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeUInt32Size(3, status_); + .computeUInt32Size(3, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -231,8 +304,10 @@ public final class StubGPIOWriteByteResponseOuterClass { boolean result = true; result = result && getPortId() .equals(other.getPortId()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -247,7 +322,9 @@ public final class StubGPIOWriteByteResponseOuterClass { hash = (37 * hash) + PORTID_FIELD_NUMBER; hash = (53 * hash) + getPortId().hashCode(); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + getStatus(); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -379,7 +456,9 @@ public final class StubGPIOWriteByteResponseOuterClass { super.clear(); portId_ = ""; - status_ = 0; + status_ = ""; + + statusWord_ = 0; return this; } @@ -405,6 +484,7 @@ public final class StubGPIOWriteByteResponseOuterClass { com.twine.tango.pmr.stubs.StubGPIOWriteByteResponseOuterClass.StubGPIOWriteByteResponse result = new com.twine.tango.pmr.stubs.StubGPIOWriteByteResponseOuterClass.StubGPIOWriteByteResponse(this); result.portId_ = portId_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -450,8 +530,12 @@ public final class StubGPIOWriteByteResponseOuterClass { portId_ = other.portId_; onChanged(); } - if (other.getStatus() != 0) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -569,40 +653,129 @@ public final class StubGPIOWriteByteResponseOuterClass { return this; } - private int status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 status = 3;</code> + * <code>string Status = 2;</code> */ - public int getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 status = 3;</code> + * <code>string Status = 2;</code> */ - public Builder setStatus(int value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>uint32 status = 3;</code> + * <code>string Status = 2;</code> */ public Builder clearStatus() { - status_ = 0; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 2;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 3;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 3;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 3;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -670,9 +843,10 @@ public final class StubGPIOWriteByteResponseOuterClass { static { java.lang.String[] descriptorData = { "\n\037StubGPIOWriteByteResponse.proto\022\017Tango" + - ".PMR.Stubs\";\n\031StubGPIOWriteByteResponse\022" + - "\016\n\006PortId\030\001 \001(\t\022\016\n\006status\030\003 \001(\rB\033\n\031com.t" + - "wine.tango.pmr.stubsb\006proto3" + ".PMR.Stubs\"O\n\031StubGPIOWriteByteResponse\022" + + "\016\n\006PortId\030\001 \001(\t\022\016\n\006Status\030\002 \001(\t\022\022\n\nStatu" + + "sWord\030\003 \001(\rB\033\n\031com.twine.tango.pmr.stubs" + + "b\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -691,7 +865,7 @@ public final class StubGPIOWriteByteResponseOuterClass { internal_static_Tango_PMR_Stubs_StubGPIOWriteByteResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubGPIOWriteByteResponse_descriptor, - new java.lang.String[] { "PortId", "Status", }); + new java.lang.String[] { "PortId", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterResponseOuterClass.java index 875b1aeac..055eed4d3 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubHeaterResponseOuterClass.java @@ -34,12 +34,30 @@ public final class StubHeaterResponseOuterClass { /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - boolean getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubHeaterResponse} @@ -56,7 +74,8 @@ public final class StubHeaterResponseOuterClass { private StubHeaterResponse() { heaterGroupId_ = 0; heaterTemperatureSensor_ = 0; - status_ = false; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -97,9 +116,15 @@ public final class StubHeaterResponseOuterClass { heaterTemperatureSensor_ = input.readUInt32(); break; } - case 24: { + case 26: { + java.lang.String s = input.readStringRequireUtf8(); - status_ = input.readBool(); + status_ = s; + break; + } + case 32: { + + statusWord_ = input.readUInt32(); break; } } @@ -149,16 +174,58 @@ public final class StubHeaterResponseOuterClass { } public static final int STATUS_FIELD_NUMBER = 3; - private boolean status_; + private volatile java.lang.Object status_; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 4; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -179,8 +246,11 @@ public final class StubHeaterResponseOuterClass { if (heaterTemperatureSensor_ != 0) { output.writeUInt32(2, heaterTemperatureSensor_); } - if (status_ != false) { - output.writeBool(3, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(4, statusWord_); } unknownFields.writeTo(output); } @@ -198,9 +268,12 @@ public final class StubHeaterResponseOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(2, heaterTemperatureSensor_); } - if (status_ != false) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, status_); + .computeUInt32Size(4, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -222,8 +295,10 @@ public final class StubHeaterResponseOuterClass { == other.getHeaterGroupId()); result = result && (getHeaterTemperatureSensor() == other.getHeaterTemperatureSensor()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -240,8 +315,9 @@ public final class StubHeaterResponseOuterClass { hash = (37 * hash) + HEATERTEMPERATURESENSOR_FIELD_NUMBER; hash = (53 * hash) + getHeaterTemperatureSensor(); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getStatus()); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -375,7 +451,9 @@ public final class StubHeaterResponseOuterClass { heaterTemperatureSensor_ = 0; - status_ = false; + status_ = ""; + + statusWord_ = 0; return this; } @@ -402,6 +480,7 @@ public final class StubHeaterResponseOuterClass { result.heaterGroupId_ = heaterGroupId_; result.heaterTemperatureSensor_ = heaterTemperatureSensor_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -449,8 +528,12 @@ public final class StubHeaterResponseOuterClass { if (other.getHeaterTemperatureSensor() != 0) { setHeaterTemperatureSensor(other.getHeaterTemperatureSensor()); } - if (other.getStatus() != false) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -543,40 +626,129 @@ public final class StubHeaterResponseOuterClass { return this; } - private boolean status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - public Builder setStatus(boolean value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ public Builder clearStatus() { - status_ = false; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -644,10 +816,10 @@ public final class StubHeaterResponseOuterClass { static { java.lang.String[] descriptorData = { "\n\030StubHeaterResponse.proto\022\017Tango.PMR.St" + - "ubs\"\\\n\022StubHeaterResponse\022\025\n\rHeaterGroup" + + "ubs\"p\n\022StubHeaterResponse\022\025\n\rHeaterGroup" + "Id\030\001 \001(\r\022\037\n\027HeaterTemperatureSensor\030\002 \001(" + - "\r\022\016\n\006Status\030\003 \001(\010B\033\n\031com.twine.tango.pmr" + - ".stubsb\006proto3" + "\r\022\016\n\006Status\030\003 \001(\t\022\022\n\nStatusWord\030\004 \001(\rB\033\n" + + "\031com.twine.tango.pmr.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -666,7 +838,7 @@ public final class StubHeaterResponseOuterClass { internal_static_Tango_PMR_Stubs_StubHeaterResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubHeaterResponse_descriptor, - new java.lang.String[] { "HeaterGroupId", "HeaterTemperatureSensor", "Status", }); + new java.lang.String[] { "HeaterGroupId", "HeaterTemperatureSensor", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderResponseOuterClass.java index 9fd3aa229..53af5a43d 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubMotorEncoderResponseOuterClass.java @@ -48,12 +48,30 @@ public final class StubMotorEncoderResponseOuterClass { /** * <pre> - * 0-OK 1-Failed ( motion control error > ?) + * Passed/Failed * </pre> * - * <code>bool Status = 5;</code> + * <code>string Status = 5;</code> */ - boolean getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 5;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 6;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubMotorEncoderResponse} @@ -72,7 +90,8 @@ public final class StubMotorEncoderResponseOuterClass { encoderVersion_ = 0; motorSpeed_ = 0; motorDirection_ = false; - status_ = false; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -123,9 +142,15 @@ public final class StubMotorEncoderResponseOuterClass { motorDirection_ = input.readBool(); break; } - case 40: { + case 42: { + java.lang.String s = input.readStringRequireUtf8(); - status_ = input.readBool(); + status_ = s; + break; + } + case 48: { + + statusWord_ = input.readUInt32(); break; } } @@ -197,16 +222,58 @@ public final class StubMotorEncoderResponseOuterClass { } public static final int STATUS_FIELD_NUMBER = 5; - private boolean status_; + private volatile java.lang.Object status_; /** * <pre> - * 0-OK 1-Failed ( motion control error > ?) + * Passed/Failed * </pre> * - * <code>bool Status = 5;</code> + * <code>string Status = 5;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 5;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 6; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 6;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -233,8 +300,11 @@ public final class StubMotorEncoderResponseOuterClass { if (motorDirection_ != false) { output.writeBool(4, motorDirection_); } - if (status_ != false) { - output.writeBool(5, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 5, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(6, statusWord_); } unknownFields.writeTo(output); } @@ -260,9 +330,12 @@ public final class StubMotorEncoderResponseOuterClass { size += com.google.protobuf.CodedOutputStream .computeBoolSize(4, motorDirection_); } - if (status_ != false) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(5, status_); + .computeUInt32Size(6, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -288,8 +361,10 @@ public final class StubMotorEncoderResponseOuterClass { == other.getMotorSpeed()); result = result && (getMotorDirection() == other.getMotorDirection()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -311,8 +386,9 @@ public final class StubMotorEncoderResponseOuterClass { hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getMotorDirection()); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getStatus()); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -450,7 +526,9 @@ public final class StubMotorEncoderResponseOuterClass { motorDirection_ = false; - status_ = false; + status_ = ""; + + statusWord_ = 0; return this; } @@ -479,6 +557,7 @@ public final class StubMotorEncoderResponseOuterClass { result.motorSpeed_ = motorSpeed_; result.motorDirection_ = motorDirection_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -532,8 +611,12 @@ public final class StubMotorEncoderResponseOuterClass { if (other.getMotorDirection() != false) { setMotorDirection(other.getMotorDirection()); } - if (other.getStatus() != false) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -690,40 +773,129 @@ public final class StubMotorEncoderResponseOuterClass { return this; } - private boolean status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed ( motion control error > ?) + * Passed/Failed * </pre> * - * <code>bool Status = 5;</code> + * <code>string Status = 5;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed ( motion control error > ?) + * Passed/Failed * </pre> * - * <code>bool Status = 5;</code> + * <code>string Status = 5;</code> */ - public Builder setStatus(boolean value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 5;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed ( motion control error > ?) + * Passed/Failed * </pre> * - * <code>bool Status = 5;</code> + * <code>string Status = 5;</code> */ public Builder clearStatus() { - status_ = false; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 5;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 6;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 6;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 6;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -791,11 +963,11 @@ public final class StubMotorEncoderResponseOuterClass { static { java.lang.String[] descriptorData = { "\n\036StubMotorEncoderResponse.proto\022\017Tango." + - "PMR.Stubs\"\201\001\n\030StubMotorEncoderResponse\022\021" + + "PMR.Stubs\"\225\001\n\030StubMotorEncoderResponse\022\021" + "\n\tEncoderId\030\001 \001(\r\022\026\n\016EncoderVersion\030\002 \001(" + "\r\022\022\n\nMotorSpeed\030\003 \001(\005\022\026\n\016MotorDirection\030" + - "\004 \001(\010\022\016\n\006Status\030\005 \001(\010B\033\n\031com.twine.tango" + - ".pmr.stubsb\006proto3" + "\004 \001(\010\022\016\n\006Status\030\005 \001(\t\022\022\n\nStatusWord\030\006 \001(" + + "\rB\033\n\031com.twine.tango.pmr.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -814,7 +986,7 @@ public final class StubMotorEncoderResponseOuterClass { internal_static_Tango_PMR_Stubs_StubMotorEncoderResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubMotorEncoderResponse_descriptor, - new java.lang.String[] { "EncoderId", "EncoderVersion", "MotorSpeed", "MotorDirection", "Status", }); + new java.lang.String[] { "EncoderId", "EncoderVersion", "MotorSpeed", "MotorDirection", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchResponseOuterClass.java index a0e0f6f86..147a317c5 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubOptLimitSwitchResponseOuterClass.java @@ -37,12 +37,30 @@ public final class StubOptLimitSwitchResponseOuterClass { /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - boolean getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubOptLimitSwitchResponse} @@ -59,7 +77,8 @@ public final class StubOptLimitSwitchResponseOuterClass { private StubOptLimitSwitchResponse() { limitSwitchrId_ = 0; limitSwitchDitection_ = false; - status_ = false; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -100,9 +119,15 @@ public final class StubOptLimitSwitchResponseOuterClass { limitSwitchDitection_ = input.readBool(); break; } - case 24: { + case 26: { + java.lang.String s = input.readStringRequireUtf8(); - status_ = input.readBool(); + status_ = s; + break; + } + case 32: { + + statusWord_ = input.readUInt32(); break; } } @@ -155,16 +180,58 @@ public final class StubOptLimitSwitchResponseOuterClass { } public static final int STATUS_FIELD_NUMBER = 3; - private boolean status_; + private volatile java.lang.Object status_; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 4; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -185,8 +252,11 @@ public final class StubOptLimitSwitchResponseOuterClass { if (limitSwitchDitection_ != false) { output.writeBool(2, limitSwitchDitection_); } - if (status_ != false) { - output.writeBool(3, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(4, statusWord_); } unknownFields.writeTo(output); } @@ -204,9 +274,12 @@ public final class StubOptLimitSwitchResponseOuterClass { size += com.google.protobuf.CodedOutputStream .computeBoolSize(2, limitSwitchDitection_); } - if (status_ != false) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, status_); + .computeUInt32Size(4, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -228,8 +301,10 @@ public final class StubOptLimitSwitchResponseOuterClass { == other.getLimitSwitchrId()); result = result && (getLimitSwitchDitection() == other.getLimitSwitchDitection()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -247,8 +322,9 @@ public final class StubOptLimitSwitchResponseOuterClass { hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( getLimitSwitchDitection()); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getStatus()); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -382,7 +458,9 @@ public final class StubOptLimitSwitchResponseOuterClass { limitSwitchDitection_ = false; - status_ = false; + status_ = ""; + + statusWord_ = 0; return this; } @@ -409,6 +487,7 @@ public final class StubOptLimitSwitchResponseOuterClass { result.limitSwitchrId_ = limitSwitchrId_; result.limitSwitchDitection_ = limitSwitchDitection_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -456,8 +535,12 @@ public final class StubOptLimitSwitchResponseOuterClass { if (other.getLimitSwitchDitection() != false) { setLimitSwitchDitection(other.getLimitSwitchDitection()); } - if (other.getStatus() != false) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -559,40 +642,129 @@ public final class StubOptLimitSwitchResponseOuterClass { return this; } - private boolean status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - public Builder setStatus(boolean value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ public Builder clearStatus() { - status_ = false; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -660,10 +832,11 @@ public final class StubOptLimitSwitchResponseOuterClass { static { java.lang.String[] descriptorData = { "\n StubOptLimitSwitchResponse.proto\022\017Tang" + - "o.PMR.Stubs\"b\n\032StubOptLimitSwitchRespons" + + "o.PMR.Stubs\"v\n\032StubOptLimitSwitchRespons" + "e\022\026\n\016LimitSwitchrId\030\001 \001(\r\022\034\n\024LimitSwitch" + - "Ditection\030\002 \001(\010\022\016\n\006Status\030\003 \001(\010B\033\n\031com.t" + - "wine.tango.pmr.stubsb\006proto3" + "Ditection\030\002 \001(\010\022\016\n\006Status\030\003 \001(\t\022\022\n\nStatu" + + "sWord\030\004 \001(\rB\033\n\031com.twine.tango.pmr.stubs" + + "b\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -682,7 +855,7 @@ public final class StubOptLimitSwitchResponseOuterClass { internal_static_Tango_PMR_Stubs_StubOptLimitSwitchResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubOptLimitSwitchResponse_descriptor, - new java.lang.String[] { "LimitSwitchrId", "LimitSwitchDitection", "Status", }); + new java.lang.String[] { "LimitSwitchrId", "LimitSwitchDitection", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorResponseOuterClass.java index 5c65563ec..8852fdb4f 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubSteperMotorResponseOuterClass.java @@ -37,12 +37,30 @@ public final class StubSteperMotorResponseOuterClass { /** * <pre> - * 0-OK 1-Failed + * Passed / Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - boolean getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed / Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubSteperMotorResponse} @@ -59,7 +77,8 @@ public final class StubSteperMotorResponseOuterClass { private StubSteperMotorResponse() { motorId_ = 0; motorVersion_ = 0; - status_ = false; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -100,9 +119,15 @@ public final class StubSteperMotorResponseOuterClass { motorVersion_ = input.readUInt32(); break; } - case 24: { + case 26: { + java.lang.String s = input.readStringRequireUtf8(); - status_ = input.readBool(); + status_ = s; + break; + } + case 32: { + + statusWord_ = input.readUInt32(); break; } } @@ -155,16 +180,58 @@ public final class StubSteperMotorResponseOuterClass { } public static final int STATUS_FIELD_NUMBER = 3; - private boolean status_; + private volatile java.lang.Object status_; /** * <pre> - * 0-OK 1-Failed + * Passed / Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed / Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 4; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -185,8 +252,11 @@ public final class StubSteperMotorResponseOuterClass { if (motorVersion_ != 0) { output.writeUInt32(2, motorVersion_); } - if (status_ != false) { - output.writeBool(3, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(4, statusWord_); } unknownFields.writeTo(output); } @@ -204,9 +274,12 @@ public final class StubSteperMotorResponseOuterClass { size += com.google.protobuf.CodedOutputStream .computeUInt32Size(2, motorVersion_); } - if (status_ != false) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, status_); + .computeUInt32Size(4, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -228,8 +301,10 @@ public final class StubSteperMotorResponseOuterClass { == other.getMotorId()); result = result && (getMotorVersion() == other.getMotorVersion()); - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -246,8 +321,9 @@ public final class StubSteperMotorResponseOuterClass { hash = (37 * hash) + MOTORVERSION_FIELD_NUMBER; hash = (53 * hash) + getMotorVersion(); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getStatus()); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -381,7 +457,9 @@ public final class StubSteperMotorResponseOuterClass { motorVersion_ = 0; - status_ = false; + status_ = ""; + + statusWord_ = 0; return this; } @@ -408,6 +486,7 @@ public final class StubSteperMotorResponseOuterClass { result.motorId_ = motorId_; result.motorVersion_ = motorVersion_; result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -455,8 +534,12 @@ public final class StubSteperMotorResponseOuterClass { if (other.getMotorVersion() != 0) { setMotorVersion(other.getMotorVersion()); } - if (other.getStatus() != false) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -558,40 +641,129 @@ public final class StubSteperMotorResponseOuterClass { return this; } - private boolean status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed + * Passed / Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed + * Passed / Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ - public Builder setStatus(boolean value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed / Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed + * Passed / Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 3;</code> */ public Builder clearStatus() { - status_ = false; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed / Failed + * </pre> + * + * <code>string Status = 3;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 4;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -659,10 +831,10 @@ public final class StubSteperMotorResponseOuterClass { static { java.lang.String[] descriptorData = { "\n\035StubSteperMotorResponse.proto\022\017Tango.P" + - "MR.Stubs\"P\n\027StubSteperMotorResponse\022\017\n\007M" + + "MR.Stubs\"d\n\027StubSteperMotorResponse\022\017\n\007M" + "otorId\030\001 \001(\r\022\024\n\014MotorVersion\030\002 \001(\r\022\016\n\006St" + - "atus\030\003 \001(\010B\033\n\031com.twine.tango.pmr.stubsb" + - "\006proto3" + "atus\030\003 \001(\t\022\022\n\nStatusWord\030\004 \001(\rB\033\n\031com.tw" + + "ine.tango.pmr.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -681,7 +853,7 @@ public final class StubSteperMotorResponseOuterClass { internal_static_Tango_PMR_Stubs_StubSteperMotorResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubSteperMotorResponse_descriptor, - new java.lang.String[] { "MotorId", "MotorVersion", "Status", }); + new java.lang.String[] { "MotorId", "MotorVersion", "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveResponseOuterClass.java b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveResponseOuterClass.java index e963dff05..f33980d06 100644 --- a/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveResponseOuterClass.java +++ b/Software/Android_Studio/Tango.PMR/src/main/java/com/twine/tango/pmr/stubs/StubValveResponseOuterClass.java @@ -20,12 +20,30 @@ public final class StubValveResponseOuterClass { /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 1;</code> */ - boolean getStatus(); + java.lang.String getStatus(); + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + com.google.protobuf.ByteString + getStatusBytes(); + + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 2;</code> + */ + int getStatusWord(); } /** * Protobuf type {@code Tango.PMR.Stubs.StubValveResponse} @@ -40,7 +58,8 @@ public final class StubValveResponseOuterClass { super(builder); } private StubValveResponse() { - status_ = false; + status_ = ""; + statusWord_ = 0; } @java.lang.Override @@ -71,9 +90,15 @@ public final class StubValveResponseOuterClass { } break; } - case 24: { + case 10: { + java.lang.String s = input.readStringRequireUtf8(); - status_ = input.readBool(); + status_ = s; + break; + } + case 16: { + + statusWord_ = input.readUInt32(); break; } } @@ -100,17 +125,59 @@ public final class StubValveResponseOuterClass { com.twine.tango.pmr.stubs.StubValveResponseOuterClass.StubValveResponse.class, com.twine.tango.pmr.stubs.StubValveResponseOuterClass.StubValveResponse.Builder.class); } - public static final int STATUS_FIELD_NUMBER = 3; - private boolean status_; + public static final int STATUS_FIELD_NUMBER = 1; + private volatile java.lang.Object status_; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 1;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + 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(); + status_ = s; + return s; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int STATUSWORD_FIELD_NUMBER = 2; + private int statusWord_; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 2;</code> + */ + public int getStatusWord() { + return statusWord_; } private byte memoizedIsInitialized = -1; @@ -125,8 +192,11 @@ public final class StubValveResponseOuterClass { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (status_ != false) { - output.writeBool(3, status_); + if (!getStatusBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, status_); + } + if (statusWord_ != 0) { + output.writeUInt32(2, statusWord_); } unknownFields.writeTo(output); } @@ -136,9 +206,12 @@ public final class StubValveResponseOuterClass { if (size != -1) return size; size = 0; - if (status_ != false) { + if (!getStatusBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, status_); + } + if (statusWord_ != 0) { size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, status_); + .computeUInt32Size(2, statusWord_); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -156,8 +229,10 @@ public final class StubValveResponseOuterClass { com.twine.tango.pmr.stubs.StubValveResponseOuterClass.StubValveResponse other = (com.twine.tango.pmr.stubs.StubValveResponseOuterClass.StubValveResponse) obj; boolean result = true; - result = result && (getStatus() - == other.getStatus()); + result = result && getStatus() + .equals(other.getStatus()); + result = result && (getStatusWord() + == other.getStatusWord()); result = result && unknownFields.equals(other.unknownFields); return result; } @@ -170,8 +245,9 @@ public final class StubValveResponseOuterClass { int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); hash = (37 * hash) + STATUS_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( - getStatus()); + hash = (53 * hash) + getStatus().hashCode(); + hash = (37 * hash) + STATUSWORD_FIELD_NUMBER; + hash = (53 * hash) + getStatusWord(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -301,7 +377,9 @@ public final class StubValveResponseOuterClass { } public Builder clear() { super.clear(); - status_ = false; + status_ = ""; + + statusWord_ = 0; return this; } @@ -326,6 +404,7 @@ public final class StubValveResponseOuterClass { public com.twine.tango.pmr.stubs.StubValveResponseOuterClass.StubValveResponse buildPartial() { com.twine.tango.pmr.stubs.StubValveResponseOuterClass.StubValveResponse result = new com.twine.tango.pmr.stubs.StubValveResponseOuterClass.StubValveResponse(this); result.status_ = status_; + result.statusWord_ = statusWord_; onBuilt(); return result; } @@ -367,8 +446,12 @@ public final class StubValveResponseOuterClass { public Builder mergeFrom(com.twine.tango.pmr.stubs.StubValveResponseOuterClass.StubValveResponse other) { if (other == com.twine.tango.pmr.stubs.StubValveResponseOuterClass.StubValveResponse.getDefaultInstance()) return this; - if (other.getStatus() != false) { - setStatus(other.getStatus()); + if (!other.getStatus().isEmpty()) { + status_ = other.status_; + onChanged(); + } + if (other.getStatusWord() != 0) { + setStatusWord(other.getStatusWord()); } this.mergeUnknownFields(other.unknownFields); onChanged(); @@ -397,40 +480,129 @@ public final class StubValveResponseOuterClass { return this; } - private boolean status_ ; + private java.lang.Object status_ = ""; /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 1;</code> */ - public boolean getStatus() { - return status_; + public java.lang.String getStatus() { + java.lang.Object ref = status_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + status_ = s; + return s; + } else { + return (java.lang.String) ref; + } } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 1;</code> */ - public Builder setStatus(boolean value) { - + public com.google.protobuf.ByteString + getStatusBytes() { + java.lang.Object ref = status_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + status_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + public Builder setStatus( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; onChanged(); return this; } /** * <pre> - * 0-OK 1-Failed + * Passed/Failed * </pre> * - * <code>bool Status = 3;</code> + * <code>string Status = 1;</code> */ public Builder clearStatus() { - status_ = false; + status_ = getDefaultInstance().getStatus(); + onChanged(); + return this; + } + /** + * <pre> + * Passed/Failed + * </pre> + * + * <code>string Status = 1;</code> + */ + public Builder setStatusBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + status_ = value; + onChanged(); + return this; + } + + private int statusWord_ ; + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 2;</code> + */ + public int getStatusWord() { + return statusWord_; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 2;</code> + */ + public Builder setStatusWord(int value) { + + statusWord_ = value; + onChanged(); + return this; + } + /** + * <pre> + * Error number/bit when the status is Failed + * </pre> + * + * <code>uint32 StatusWord = 2;</code> + */ + public Builder clearStatusWord() { + + statusWord_ = 0; onChanged(); return this; } @@ -498,8 +670,9 @@ public final class StubValveResponseOuterClass { static { java.lang.String[] descriptorData = { "\n\027StubValveResponse.proto\022\017Tango.PMR.Stu" + - "bs\"#\n\021StubValveResponse\022\016\n\006Status\030\003 \001(\010B" + - "\033\n\031com.twine.tango.pmr.stubsb\006proto3" + "bs\"7\n\021StubValveResponse\022\016\n\006Status\030\001 \001(\t\022" + + "\022\n\nStatusWord\030\002 \001(\rB\033\n\031com.twine.tango.p" + + "mr.stubsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -518,7 +691,7 @@ public final class StubValveResponseOuterClass { internal_static_Tango_PMR_Stubs_StubValveResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_Tango_PMR_Stubs_StubValveResponse_descriptor, - new java.lang.String[] { "Status", }); + new java.lang.String[] { "Status", "StatusWord", }); } // @@protoc_insertion_point(outer_class_scope) diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c index 350a5e5bd..a9684e855 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.c @@ -46,18 +46,18 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[46] = { "StubExtFlashReadResponse", "MESSAGE_TYPE__StubExtFlashReadResponse", 34 }, { "StubExtFlashWriteRequest", "MESSAGE_TYPE__StubExtFlashWriteRequest", 35 }, { "StubExtFlashWriteResponse", "MESSAGE_TYPE__StubExtFlashWriteResponse", 36 }, - { "ExternalBridgeUdpDiscoveryPacket", "MESSAGE_TYPE__ExternalBridgeUdpDiscoveryPacket", 37 }, - { "ExternalClientLoginRequest", "MESSAGE_TYPE__ExternalClientLoginRequest", 38 }, - { "ExternalClientLoginResponse", "MESSAGE_TYPE__ExternalClientLoginResponse", 39 }, - { "DirectSynchronizationRequest", "MESSAGE_TYPE__DirectSynchronizationRequest", 40 }, - { "DirectSynchronizationResponse", "MESSAGE_TYPE__DirectSynchronizationResponse", 41 }, - { "OverrideDataBaseRequest", "MESSAGE_TYPE__OverrideDataBaseRequest", 42 }, - { "OverrideDataBaseResponse", "MESSAGE_TYPE__OverrideDataBaseResponse", 43 }, - { "KeepAliveRequest", "MESSAGE_TYPE__KeepAliveRequest", 44 }, - { "KeepAliveResponse", "MESSAGE_TYPE__KeepAliveResponse", 45 }, + { "ExternalBridgeUdpDiscoveryPacket", "MESSAGE_TYPE__ExternalBridgeUdpDiscoveryPacket", 1000 }, + { "ExternalClientLoginRequest", "MESSAGE_TYPE__ExternalClientLoginRequest", 1001 }, + { "ExternalClientLoginResponse", "MESSAGE_TYPE__ExternalClientLoginResponse", 1002 }, + { "DirectSynchronizationRequest", "MESSAGE_TYPE__DirectSynchronizationRequest", 1003 }, + { "DirectSynchronizationResponse", "MESSAGE_TYPE__DirectSynchronizationResponse", 1004 }, + { "OverrideDataBaseRequest", "MESSAGE_TYPE__OverrideDataBaseRequest", 1005 }, + { "OverrideDataBaseResponse", "MESSAGE_TYPE__OverrideDataBaseResponse", 1006 }, + { "KeepAliveRequest", "MESSAGE_TYPE__KeepAliveRequest", 1007 }, + { "KeepAliveResponse", "MESSAGE_TYPE__KeepAliveResponse", 1008 }, }; static const ProtobufCIntRange message_type__value_ranges[] = { -{0, 0},{0, 46} +{0, 0},{1000, 37},{0, 46} }; static const ProtobufCEnumValueIndex message_type__enum_values_by_name[46] = { @@ -119,7 +119,7 @@ const ProtobufCEnumDescriptor message_type__descriptor = message_type__enum_values_by_number, 46, message_type__enum_values_by_name, - 1, + 2, message_type__value_ranges, NULL,NULL,NULL,NULL /* reserved[1234] */ }; diff --git a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h index 18fb45844..b5040d4d1 100644 --- a/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h +++ b/Software/Code_Composer/twine_usblib_demo/PMR/Common/MessageType.pb-c.h @@ -57,15 +57,15 @@ typedef enum _MessageType { MESSAGE_TYPE__StubExtFlashReadResponse = 34, MESSAGE_TYPE__StubExtFlashWriteRequest = 35, MESSAGE_TYPE__StubExtFlashWriteResponse = 36, - MESSAGE_TYPE__ExternalBridgeUdpDiscoveryPacket = 37, - MESSAGE_TYPE__ExternalClientLoginRequest = 38, - MESSAGE_TYPE__ExternalClientLoginResponse = 39, - MESSAGE_TYPE__DirectSynchronizationRequest = 40, - MESSAGE_TYPE__DirectSynchronizationResponse = 41, - MESSAGE_TYPE__OverrideDataBaseRequest = 42, - MESSAGE_TYPE__OverrideDataBaseResponse = 43, - MESSAGE_TYPE__KeepAliveRequest = 44, - MESSAGE_TYPE__KeepAliveResponse = 45 + MESSAGE_TYPE__ExternalBridgeUdpDiscoveryPacket = 1000, + MESSAGE_TYPE__ExternalClientLoginRequest = 1001, + MESSAGE_TYPE__ExternalClientLoginResponse = 1002, + MESSAGE_TYPE__DirectSynchronizationRequest = 1003, + MESSAGE_TYPE__DirectSynchronizationResponse = 1004, + MESSAGE_TYPE__OverrideDataBaseRequest = 1005, + MESSAGE_TYPE__OverrideDataBaseResponse = 1006, + MESSAGE_TYPE__KeepAliveRequest = 1007, + MESSAGE_TYPE__KeepAliveResponse = 1008 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MESSAGE_TYPE) } MessageType; diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex 0225fcafe..b72c7fda6 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex e6cf1ee91..8341fba39 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto index 4e971a41c..d1b34ba77 100644 --- a/Software/PMR/Messages/Common/MessageType.proto +++ b/Software/PMR/Messages/Common/MessageType.proto @@ -5,9 +5,12 @@ option java_package = "com.twine.tango.pmr.common"; enum MessageType { + RGB = 0; Job = 1; Segment = 2; + + //Stubs CalculateRequest = 3; CalculateResponse = 4; ProgressRequest = 5; @@ -42,13 +45,16 @@ enum MessageType StubExtFlashReadResponse = 34; StubExtFlashWriteRequest = 35; StubExtFlashWriteResponse = 36; - ExternalBridgeUdpDiscoveryPacket = 37; - ExternalClientLoginRequest = 38; - ExternalClientLoginResponse = 39; - DirectSynchronizationRequest = 40; - DirectSynchronizationResponse = 41; - OverrideDataBaseRequest = 42; - OverrideDataBaseResponse = 43; - KeepAliveRequest = 44; - KeepAliveResponse = 45; + + + //Integration + ExternalBridgeUdpDiscoveryPacket = 1000; + ExternalClientLoginRequest = 1001; + ExternalClientLoginResponse = 1002; + DirectSynchronizationRequest = 1003; + DirectSynchronizationResponse = 1004; + OverrideDataBaseRequest = 1005; + OverrideDataBaseResponse = 1006; + KeepAliveRequest = 1007; + KeepAliveResponse = 1008; } diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Views/MainView.xaml index 5a71b48d1..7f6039110 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Views/MainView.xaml @@ -217,14 +217,11 @@ <DockPanel> <GroupBox Header="COMMUNICATION PORT" VerticalAlignment="Top" DockPanel.Dock="Top" Margin="0 2 0 0"> <StackPanel> - <Grid VerticalAlignment="Center"> - <Grid.ColumnDefinitions> - <ColumnDefinition Width="Auto"></ColumnDefinition> - <ColumnDefinition Width="*"></ColumnDefinition> - </Grid.ColumnDefinitions> - <CheckBox x:Name="chkUseCurrentMachine" ToolTip="Use the currently connected machine to execute stubs" Margin="0 0 0 0" VerticalAlignment="Center" IsChecked="{Binding UseConnectedMachine}">Connected Machine</CheckBox> - <ComboBox Grid.Column="1" IsEnabled="{Binding ElementName=chkUseCurrentMachine,Path=IsChecked,Converter={StaticResource BooleanInverseConverter}}" Margin="10 0 0 0" BorderThickness="0" ItemsSource="{Binding Ports}" Height="35" SelectedItem="{Binding SelectedPort}"></ComboBox> - </Grid> + <StackPanel Orientation="Horizontal"> + <ToggleButton Margin="5" Style="{StaticResource MaterialDesignSwitchToggleButton}" Height="35" HorizontalAlignment="Left" x:Name="chkUseCurrentMachine" ToolTip="Use the currently connected machine to execute stubs" IsChecked="{Binding UseConnectedMachine}"></ToggleButton> + <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Use Connected Machine</TextBlock> + </StackPanel> + <ComboBox Margin="5" IsEnabled="{Binding ElementName=chkUseCurrentMachine,Path=IsChecked,Converter={StaticResource BooleanInverseConverter}}" BorderThickness="0" ItemsSource="{Binding Ports}" Height="35" SelectedItem="{Binding SelectedPort}"></ComboBox> </StackPanel> </GroupBox> diff --git a/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeClientType.cs b/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeClientType.cs new file mode 100644 index 000000000..af58414ec --- /dev/null +++ b/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeClientType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tango.Integration.Services +{ + public enum ExternalBridgeClientType + { + TCP, + USB, + BT, + } +} diff --git a/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeScanner.cs b/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeScanner.cs index 12efb1506..c17b64cfd 100644 --- a/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeScanner.cs +++ b/Software/Visual_Studio/Tango.Integration/Services/ExternalBridgeScanner.cs @@ -1,7 +1,9 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; +using System.IO.Ports; using System.Linq; +using System.Management; using System.Net; using System.Net.NetworkInformation; using System.Net.Sockets; @@ -64,6 +66,27 @@ namespace Tango.Integration.Services } } + /// <summary> + /// Scans the USB. + /// </summary> + public void ScanUSB() + { + using (var searcher = new ManagementObjectSearcher("SELECT * FROM WIN32_SerialPort")) + { + string[] portnames = SerialPort.GetPortNames(); + var ports = searcher.Get().Cast<ManagementBaseObject>().ToList(); + + var tList = (from n in portnames + join p in ports on n equals p["DeviceID"].ToString() + select n + " - " + p["Caption"]).ToList(); + + foreach (string s in tList) + { + AvailableMachines.Add(new ExternalBridgeClient(null, null)); + } + } + } + private void DiscoveryThreadMethod() { var Server = new UdpClient(8888); diff --git a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj index e07c5a90d..83d7dabf2 100644 --- a/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj +++ b/Software/Visual_Studio/Tango.Integration/Tango.Integration.csproj @@ -35,6 +35,7 @@ </Reference> <Reference Include="System" /> <Reference Include="System.Core" /> + <Reference Include="System.Management" /> <Reference Include="System.Xml.Linq" /> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="Microsoft.CSharp" /> @@ -47,6 +48,7 @@ <Link>GlobalVersionInfo.cs</Link> </Compile> <Compile Include="Services\ExternalBridgeClient.cs" /> + <Compile Include="Services\ExternalBridgeClientType.cs" /> <Compile Include="Services\ExternalBridgeScanner.cs" /> <Compile Include="Services\IExternalBridgeClient.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs index 92e7fb1f5..ac20a4ef6 100644 --- a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs +++ b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs @@ -22,7 +22,7 @@ namespace Tango.PMR.Common { static MessageTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbir7CQoLTWVz", + "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqECgoLTWVz", "c2FnZVR5cGUSBwoDUkdCEAASBwoDSm9iEAESCwoHU2VnbWVudBACEhQKEENh", "bGN1bGF0ZVJlcXVlc3QQAxIVChFDYWxjdWxhdGVSZXNwb25zZRAEEhMKD1By", "b2dyZXNzUmVxdWVzdBAFEhQKEFByb2dyZXNzUmVzcG9uc2UQBhIcChhTdHVi", @@ -45,14 +45,14 @@ namespace Tango.PMR.Common { "U3R1YlZhbHZlUmVzcG9uc2UQIBIbChdTdHViRXh0Rmxhc2hSZWFkUmVxdWVz", "dBAhEhwKGFN0dWJFeHRGbGFzaFJlYWRSZXNwb25zZRAiEhwKGFN0dWJFeHRG", "bGFzaFdyaXRlUmVxdWVzdBAjEh0KGVN0dWJFeHRGbGFzaFdyaXRlUmVzcG9u", - "c2UQJBIkCiBFeHRlcm5hbEJyaWRnZVVkcERpc2NvdmVyeVBhY2tldBAlEh4K", - "GkV4dGVybmFsQ2xpZW50TG9naW5SZXF1ZXN0ECYSHwobRXh0ZXJuYWxDbGll", - "bnRMb2dpblJlc3BvbnNlECcSIAocRGlyZWN0U3luY2hyb25pemF0aW9uUmVx", - "dWVzdBAoEiEKHURpcmVjdFN5bmNocm9uaXphdGlvblJlc3BvbnNlECkSGwoX", - "T3ZlcnJpZGVEYXRhQmFzZVJlcXVlc3QQKhIcChhPdmVycmlkZURhdGFCYXNl", - "UmVzcG9uc2UQKxIUChBLZWVwQWxpdmVSZXF1ZXN0ECwSFQoRS2VlcEFsaXZl", - "UmVzcG9uc2UQLUIcChpjb20udHdpbmUudGFuZ28ucG1yLmNvbW1vbmIGcHJv", - "dG8z")); + "c2UQJBIlCiBFeHRlcm5hbEJyaWRnZVVkcERpc2NvdmVyeVBhY2tldBDoBxIf", + "ChpFeHRlcm5hbENsaWVudExvZ2luUmVxdWVzdBDpBxIgChtFeHRlcm5hbENs", + "aWVudExvZ2luUmVzcG9uc2UQ6gcSIQocRGlyZWN0U3luY2hyb25pemF0aW9u", + "UmVxdWVzdBDrBxIiCh1EaXJlY3RTeW5jaHJvbml6YXRpb25SZXNwb25zZRDs", + "BxIcChdPdmVycmlkZURhdGFCYXNlUmVxdWVzdBDtBxIdChhPdmVycmlkZURh", + "dGFCYXNlUmVzcG9uc2UQ7gcSFQoQS2VlcEFsaXZlUmVxdWVzdBDvBxIWChFL", + "ZWVwQWxpdmVSZXNwb25zZRDwB0IcChpjb20udHdpbmUudGFuZ28ucG1yLmNv", + "bW1vbmIGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null)); @@ -65,6 +65,9 @@ namespace Tango.PMR.Common { [pbr::OriginalName("RGB")] Rgb = 0, [pbr::OriginalName("Job")] Job = 1, [pbr::OriginalName("Segment")] Segment = 2, + /// <summary> + ///Stubs + /// </summary> [pbr::OriginalName("CalculateRequest")] CalculateRequest = 3, [pbr::OriginalName("CalculateResponse")] CalculateResponse = 4, [pbr::OriginalName("ProgressRequest")] ProgressRequest = 5, @@ -99,15 +102,18 @@ namespace Tango.PMR.Common { [pbr::OriginalName("StubExtFlashReadResponse")] StubExtFlashReadResponse = 34, [pbr::OriginalName("StubExtFlashWriteRequest")] StubExtFlashWriteRequest = 35, [pbr::OriginalName("StubExtFlashWriteResponse")] StubExtFlashWriteResponse = 36, - [pbr::OriginalName("ExternalBridgeUdpDiscoveryPacket")] ExternalBridgeUdpDiscoveryPacket = 37, - [pbr::OriginalName("ExternalClientLoginRequest")] ExternalClientLoginRequest = 38, - [pbr::OriginalName("ExternalClientLoginResponse")] ExternalClientLoginResponse = 39, - [pbr::OriginalName("DirectSynchronizationRequest")] DirectSynchronizationRequest = 40, - [pbr::OriginalName("DirectSynchronizationResponse")] DirectSynchronizationResponse = 41, - [pbr::OriginalName("OverrideDataBaseRequest")] OverrideDataBaseRequest = 42, - [pbr::OriginalName("OverrideDataBaseResponse")] OverrideDataBaseResponse = 43, - [pbr::OriginalName("KeepAliveRequest")] KeepAliveRequest = 44, - [pbr::OriginalName("KeepAliveResponse")] KeepAliveResponse = 45, + /// <summary> + ///Integration + /// </summary> + [pbr::OriginalName("ExternalBridgeUdpDiscoveryPacket")] ExternalBridgeUdpDiscoveryPacket = 1000, + [pbr::OriginalName("ExternalClientLoginRequest")] ExternalClientLoginRequest = 1001, + [pbr::OriginalName("ExternalClientLoginResponse")] ExternalClientLoginResponse = 1002, + [pbr::OriginalName("DirectSynchronizationRequest")] DirectSynchronizationRequest = 1003, + [pbr::OriginalName("DirectSynchronizationResponse")] DirectSynchronizationResponse = 1004, + [pbr::OriginalName("OverrideDataBaseRequest")] OverrideDataBaseRequest = 1005, + [pbr::OriginalName("OverrideDataBaseResponse")] OverrideDataBaseResponse = 1006, + [pbr::OriginalName("KeepAliveRequest")] KeepAliveRequest = 1007, + [pbr::OriginalName("KeepAliveResponse")] KeepAliveResponse = 1008, } #endregion |
