merging dev/G3andNeon branch and fixing conflicts about size.

1 files changed, 32 insertions, 0 deletions

diff --git a/docs/user_guide/eye_tracking_context/context_modules/pupil_labs_neon.md b/docs/user_guide/eye_tracking_context/context_modules/pupil_labs_neon.md
new file mode 100644
index 0000000..535f5d5
--- /dev/null
+++ b/docs/user_guide/eye_tracking_context/context_modules/pupil_labs_neon.md
@@ -0,0 +1,32 @@
+Pupil Labs Neon
+==========
+
+ArGaze provides a ready-made context to work with Pupil Labs Neon device.
+
+To select a desired context, the JSON samples have to be edited and saved inside an [ArContext configuration](../configuration_and_execution.md) file.
+Notice that the *pipeline* entry is mandatory.
+
+```json
+{
+	JSON sample
+	"pipeline": ...
+}
+```
+
+Read more about [ArContext base class in code reference](../../../argaze.md/#argaze.ArFeatures.ArContext).
+
+## Live Stream
+
+::: argaze.utils.contexts.PupilLabsNeon.LiveStream
+
+### JSON sample
+
+```json
+{
+	"argaze.utils.contexts.PupilLabsNeon.LiveStream": {
+		"name": "Pupil Labs Neon live stream",
+		"project": "my_experiment",
+		"pipeline": ...
+	}
+}
+```