@zaber/motion 3.4.2 → 4.0.0

package/dist/lib/protobufs/main_pb.js

@@ -127,7 +127,8 @@ goog.exportSymbol('zaber.motion.protobufs.ObjectiveChangerRequest', null, proto)
 goog.exportSymbol('zaber.motion.protobufs.OpenBinaryInterfaceRequest', null, proto);
 goog.exportSymbol('zaber.motion.protobufs.OpenInterfaceRequest', null, proto);
 goog.exportSymbol('zaber.motion.protobufs.OpenInterfaceResponse', null, proto);
-goog.exportSymbol('zaber.motion.protobufs.OscilloscopeAddChannelRequest', null, proto);
+goog.exportSymbol('zaber.motion.protobufs.OscilloscopeAddIoChannelRequest', null, proto);
+goog.exportSymbol('zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest', null, proto);
 goog.exportSymbol('zaber.motion.protobufs.OscilloscopeCaptureProperties', null, proto);
 goog.exportSymbol('zaber.motion.protobufs.OscilloscopeDataGetRequest', null, proto);
 goog.exportSymbol('zaber.motion.protobufs.OscilloscopeDataGetSampleTimeRequest', null, proto);
@@ -2235,16 +2236,37 @@ if (goog.DEBUG && !COMPILED) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest = function(opt_data) {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest, jspb.Message);
+goog.inherits(proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
   /**
    * @public
    * @override
    */
-  proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.displayName = 'proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest';
+  proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.displayName = 'proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest';
+}
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.displayName = 'proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest';
 }
 /**
  * Generated by JsPbCodeGenerator.
@@ -6898,7 +6920,8 @@ proto.zaber.motion.protobufs.Measurement.prototype.toObject = function(opt_inclu
 proto.zaber.motion.protobufs.Measurement.toObject = function(includeInstance, msg) {
   var f, obj = {
     value: jspb.Message.getFloatingPointFieldWithDefault(msg, 1, 0.0),
-    unit: jspb.Message.getFieldWithDefault(msg, 7, "")
+    unit: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    isNull: jspb.Message.getBooleanFieldWithDefault(msg, 3, false)
   };
 
   if (includeInstance) {
@@ -6939,10 +6962,14 @@ proto.zaber.motion.protobufs.Measurement.deserializeBinaryFromReader = function(
       var value = /** @type {number} */ (reader.readDouble());
       msg.setValue(value);
       break;
-    case 7:
+    case 2:
       var value = /** @type {string} */ (reader.readString());
       msg.setUnit(value);
       break;
+    case 3:
+      var value = /** @type {boolean} */ (reader.readBool());
+      msg.setIsNull(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -6982,7 +7009,14 @@ proto.zaber.motion.protobufs.Measurement.serializeBinaryToWriter = function(mess
   f = message.getUnit();
   if (f.length > 0) {
     writer.writeString(
-      7,
+      2,
+      f
+    );
+  }
+  f = message.getIsNull();
+  if (f) {
+    writer.writeBool(
+      3,
       f
     );
   }
@@ -7008,11 +7042,11 @@ proto.zaber.motion.protobufs.Measurement.prototype.setValue = function(value) {
 
 
 /**
- * optional string unit = 7;
+ * optional string unit = 2;
  * @return {string}
  */
 proto.zaber.motion.protobufs.Measurement.prototype.getUnit = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 7, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
@@ -7021,7 +7055,25 @@ proto.zaber.motion.protobufs.Measurement.prototype.getUnit = function() {
  * @return {!proto.zaber.motion.protobufs.Measurement} returns this
  */
 proto.zaber.motion.protobufs.Measurement.prototype.setUnit = function(value) {
-  return jspb.Message.setProto3StringField(this, 7, value);
+  return jspb.Message.setProto3StringField(this, 2, value);
+};
+
+
+/**
+ * optional bool is_null = 3;
+ * @return {boolean}
+ */
+proto.zaber.motion.protobufs.Measurement.prototype.getIsNull = function() {
+  return /** @type {boolean} */ (jspb.Message.getBooleanFieldWithDefault(this, 3, false));
+};
+
+
+/**
+ * @param {boolean} value
+ * @return {!proto.zaber.motion.protobufs.Measurement} returns this
+ */
+proto.zaber.motion.protobufs.Measurement.prototype.setIsNull = function(value) {
+  return jspb.Message.setProto3BooleanField(this, 3, value);
 };
 
 
@@ -24174,8 +24226,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.toObject(opt_includeInstance, this);
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -24184,11 +24236,11 @@ proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.toObject =
  * @param {boolean|undefined} includeInstance Deprecated. Whether to include
  *     the JSPB instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest} msg The msg instance to transform.
+ * @param {!proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.toObject = function(includeInstance, msg) {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
     interfaceId: jspb.Message.getFieldWithDefault(msg, 1, 0),
     device: jspb.Message.getFieldWithDefault(msg, 2, 0),
@@ -24207,23 +24259,23 @@ proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.toObject = function(i
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest}
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest}
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.deserializeBinary = function(bytes) {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest;
-  return proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest;
+  return proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest} msg The message object to deserialize into.
+ * @param {!proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest}
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest}
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -24259,9 +24311,9 @@ proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.deserializeBinaryFrom
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.serializeBinary = function() {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.serializeBinaryToWriter(this, writer);
+  proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -24269,11 +24321,11 @@ proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.serializeBi
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest} message
+ * @param {!proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.serializeBinaryToWriter = function(message, writer) {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getInterfaceId();
   if (f !== 0) {
@@ -24310,16 +24362,16 @@ proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.serializeBinaryToWrit
  * optional int32 interface_id = 1;
  * @return {number}
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.getInterfaceId = function() {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.prototype.getInterfaceId = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
 /**
  * @param {number} value
- * @return {!proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest} returns this
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest} returns this
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.setInterfaceId = function(value) {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.prototype.setInterfaceId = function(value) {
   return jspb.Message.setProto3IntField(this, 1, value);
 };
 
@@ -24328,16 +24380,16 @@ proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.setInterfac
  * optional int32 device = 2;
  * @return {number}
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.getDevice = function() {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.prototype.getDevice = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
 /**
  * @param {number} value
- * @return {!proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest} returns this
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest} returns this
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.setDevice = function(value) {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.prototype.setDevice = function(value) {
   return jspb.Message.setProto3IntField(this, 2, value);
 };
 
@@ -24346,16 +24398,16 @@ proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.setDevice =
  * optional int32 axis = 3;
  * @return {number}
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.getAxis = function() {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.prototype.getAxis = function() {
   return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
 };
 
 
 /**
  * @param {number} value
- * @return {!proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest} returns this
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest} returns this
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.setAxis = function(value) {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.prototype.setAxis = function(value) {
   return jspb.Message.setProto3IntField(this, 3, value);
 };
 
@@ -24364,16 +24416,16 @@ proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.setAxis = f
  * optional string setting = 4;
  * @return {string}
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.getSetting = function() {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.prototype.getSetting = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
 
 /**
  * @param {string} value
- * @return {!proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest} returns this
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest} returns this
  */
-proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.setSetting = function(value) {
+proto.zaber.motion.protobufs.OscilloscopeAddSettingChannelRequest.prototype.setSetting = function(value) {
   return jspb.Message.setProto3StringField(this, 4, value);
 };
 
@@ -24381,6 +24433,226 @@ proto.zaber.motion.protobufs.OscilloscopeAddChannelRequest.prototype.setSetting
 
 
 
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    interfaceId: jspb.Message.getFieldWithDefault(msg, 1, 0),
+    device: jspb.Message.getFieldWithDefault(msg, 2, 0),
+    ioType: jspb.Message.getFieldWithDefault(msg, 3, 0),
+    ioChannel: jspb.Message.getFieldWithDefault(msg, 4, 0)
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest}
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest;
+  return proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest}
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setInterfaceId(value);
+      break;
+    case 2:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setDevice(value);
+      break;
+    case 3:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setIoType(value);
+      break;
+    case 4:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setIoChannel(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getInterfaceId();
+  if (f !== 0) {
+    writer.writeInt32(
+      1,
+      f
+    );
+  }
+  f = message.getDevice();
+  if (f !== 0) {
+    writer.writeInt32(
+      2,
+      f
+    );
+  }
+  f = message.getIoType();
+  if (f !== 0) {
+    writer.writeInt32(
+      3,
+      f
+    );
+  }
+  f = message.getIoChannel();
+  if (f !== 0) {
+    writer.writeInt32(
+      4,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional int32 interface_id = 1;
+ * @return {number}
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.prototype.getInterfaceId = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest} returns this
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.prototype.setInterfaceId = function(value) {
+  return jspb.Message.setProto3IntField(this, 1, value);
+};
+
+
+/**
+ * optional int32 device = 2;
+ * @return {number}
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.prototype.getDevice = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest} returns this
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.prototype.setDevice = function(value) {
+  return jspb.Message.setProto3IntField(this, 2, value);
+};
+
+
+/**
+ * optional int32 io_type = 3;
+ * @return {number}
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.prototype.getIoType = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest} returns this
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.prototype.setIoType = function(value) {
+  return jspb.Message.setProto3IntField(this, 3, value);
+};
+
+
+/**
+ * optional int32 io_channel = 4;
+ * @return {number}
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.prototype.getIoChannel = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest} returns this
+ */
+proto.zaber.motion.protobufs.OscilloscopeAddIoChannelRequest.prototype.setIoChannel = function(value) {
+  return jspb.Message.setProto3IntField(this, 4, value);
+};
+
+
+
+
+
 if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto.
@@ -24918,8 +25190,11 @@ proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.toObject =
  */
 proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.toObject = function(includeInstance, msg) {
   var f, obj = {
-    setting: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    axisNumber: jspb.Message.getFieldWithDefault(msg, 2, 0)
+    dataSource: jspb.Message.getFieldWithDefault(msg, 1, 0),
+    setting: jspb.Message.getFieldWithDefault(msg, 2, ""),
+    axisNumber: jspb.Message.getFieldWithDefault(msg, 3, 0),
+    ioType: jspb.Message.getFieldWithDefault(msg, 4, 0),
+    ioChannel: jspb.Message.getFieldWithDefault(msg, 5, 0)
   };
 
   if (includeInstance) {
@@ -24957,13 +25232,25 @@ proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.deserializeBinaryFrom
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setDataSource(value);
+      break;
+    case 2:
       var value = /** @type {string} */ (reader.readString());
       msg.setSetting(value);
       break;
-    case 2:
+    case 3:
       var value = /** @type {number} */ (reader.readInt32());
       msg.setAxisNumber(value);
       break;
+    case 4:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setIoType(value);
+      break;
+    case 5:
+      var value = /** @type {number} */ (reader.readInt32());
+      msg.setIoChannel(value);
+      break;
     default:
       reader.skipField();
       break;
@@ -24993,17 +25280,38 @@ proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.serializeBi
  */
 proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
+  f = message.getDataSource();
+  if (f !== 0) {
+    writer.writeInt32(
+      1,
+      f
+    );
+  }
   f = message.getSetting();
   if (f.length > 0) {
     writer.writeString(
-      1,
+      2,
       f
     );
   }
   f = message.getAxisNumber();
   if (f !== 0) {
     writer.writeInt32(
-      2,
+      3,
+      f
+    );
+  }
+  f = message.getIoType();
+  if (f !== 0) {
+    writer.writeInt32(
+      4,
+      f
+    );
+  }
+  f = message.getIoChannel();
+  if (f !== 0) {
+    writer.writeInt32(
+      5,
       f
     );
   }
@@ -25011,11 +25319,29 @@ proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.serializeBinaryToWrit
 
 
 /**
- * optional string setting = 1;
+ * optional int32 data_source = 1;
+ * @return {number}
+ */
+proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.getDataSource = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeCaptureProperties} returns this
+ */
+proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.setDataSource = function(value) {
+  return jspb.Message.setProto3IntField(this, 1, value);
+};
+
+
+/**
+ * optional string setting = 2;
  * @return {string}
  */
 proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.getSetting = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 2, ""));
 };
 
 
@@ -25024,16 +25350,16 @@ proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.getSetting
  * @return {!proto.zaber.motion.protobufs.OscilloscopeCaptureProperties} returns this
  */
 proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.setSetting = function(value) {
-  return jspb.Message.setProto3StringField(this, 1, value);
+  return jspb.Message.setProto3StringField(this, 2, value);
 };
 
 
 /**
- * optional int32 axis_number = 2;
+ * optional int32 axis_number = 3;
  * @return {number}
  */
 proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.getAxisNumber = function() {
-  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 3, 0));
 };
 
 
@@ -25042,7 +25368,43 @@ proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.getAxisNumb
  * @return {!proto.zaber.motion.protobufs.OscilloscopeCaptureProperties} returns this
  */
 proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.setAxisNumber = function(value) {
-  return jspb.Message.setProto3IntField(this, 2, value);
+  return jspb.Message.setProto3IntField(this, 3, value);
+};
+
+
+/**
+ * optional int32 io_type = 4;
+ * @return {number}
+ */
+proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.getIoType = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 4, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeCaptureProperties} returns this
+ */
+proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.setIoType = function(value) {
+  return jspb.Message.setProto3IntField(this, 4, value);
+};
+
+
+/**
+ * optional int32 io_channel = 5;
+ * @return {number}
+ */
+proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.getIoChannel = function() {
+  return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 5, 0));
+};
+
+
+/**
+ * @param {number} value
+ * @return {!proto.zaber.motion.protobufs.OscilloscopeCaptureProperties} returns this
+ */
+proto.zaber.motion.protobufs.OscilloscopeCaptureProperties.prototype.setIoChannel = function(value) {
+  return jspb.Message.setProto3IntField(this, 5, value);
 };