From 717528c1e7f59eda8404b0d5cc061d7a5cb8def1 Mon Sep 17 00:00:00 2001
From: Ryan Ly <rly@lbl.gov>
Date: Wed, 13 Nov 2019 11:16:28 -0800
Subject: [PATCH] Add description and manufacturer to Device, extract to new
 file

---
 core/nwb.device.yaml    | 14 ++++++++++++++
 core/nwb.file.yaml      |  7 +++----
 core/nwb.namespace.yaml |  3 +++
 3 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 core/nwb.device.yaml

diff --git a/core/nwb.device.yaml b/core/nwb.device.yaml
new file mode 100644
index 00000000..6a0f7815
--- /dev/null
+++ b/core/nwb.device.yaml
@@ -0,0 +1,14 @@
+groups:
+- neurodata_type_def: Device
+  neurodata_type_inc: NWBContainer
+  doc: Metadata about a data acquisition device, e.g., recording system, electrode, microscope.
+  attributes:
+  - name: description
+    dtype: text
+    doc: Description of the device (e.g., model, firmware version, processing software version, etc.)
+      as free-form text.
+    quantity: '?'
+  - name: manufacturer
+    dtype: text
+    doc: The name of the manufacturer of the device.
+    quantity: '?'
diff --git a/core/nwb.file.yaml b/core/nwb.file.yaml
index 5a42ac49..ebfc3df5 100644
--- a/core/nwb.file.yaml
+++ b/core/nwb.file.yaml
@@ -258,10 +258,9 @@ groups:
         ADC boards, microscopes, etc.
       quantity: '?'
       groups:
-      - neurodata_type_def: Device
-        neurodata_type_inc: NWBContainer
-        doc: A data acquisition device, e.g. recording system.
-        quantity: '+'
+      - neurodata_type_inc: Device
+        doc: Data acquisition devices.
+        quantity: '*'
     - neurodata_type_def: Subject
       neurodata_type_inc: NWBContainer
       name: subject
diff --git a/core/nwb.namespace.yaml b/core/nwb.namespace.yaml
index 2cdd8d18..ebc4ea6d 100644
--- a/core/nwb.namespace.yaml
+++ b/core/nwb.namespace.yaml
@@ -22,6 +22,9 @@ namespaces:
       format.
     source: nwb.base.yaml
     title: Base data types
+  - doc: This source module contains neurodata_types for device data.
+    source: nwb.device.yaml
+    title: Devices
   - doc: This source module contains neurodata_types for epoch data.
     source: nwb.epoch.yaml
     title: Epochs