From 29517bb62eadb2b4af64d2dc887a3481eaccf647 2017-09-04 16:22:14
From: José Chávez <jsergio.chavez@gmail.com>
Date: 2017-09-04 16:22:14
Subject: [PATCH] .gitignore

---

diff --git a/.gitignore b/.gitignore
index f9d380c..e90eb4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,7 +100,6 @@ ENV/
 # eclipse
 .project
 .pydevproject
-<<<<<<< HEAD
 
 # vscode
 
@@ -108,11 +107,7 @@ ENV/
 
 schainpy/scripts/
 schaingui/node_modules/
-=======
 .svn/
 *.png
 *.pyc
-schainpy/scripts
-
-schaingui/node_modules
->>>>>>> master
+*.xml
\ No newline at end of file
diff --git a/schainpy/scripts/schain.xml b/schainpy/scripts/schain.xml
index d66526b..4f5a3e2 100644
--- a/schainpy/scripts/schain.xml
+++ b/schainpy/scripts/schain.xml
@@ -1 +1 @@
-<Project description="test" id="191" name="john"><ReadUnit datatype="VoltageReader" id="1911" inputId="0" name="VoltageReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="server" value="tcp://10.10.10.145:5555" /></Operation></ReadUnit><ProcUnit datatype="VoltageProc" id="1912" inputId="1911" name="VoltageProc"><Operation id="19121" name="run" priority="1" type="self" /></ProcUnit></Project>
\ No newline at end of file
+<Project description="Testing USRP data reader" id="191" name="test01"><ReadUnit datatype="Spectra" id="1911" inputId="0" name="SpectraReader"><Operation id="19111" name="run" priority="1" type="self"><Parameter format="str" id="191111" name="datatype" value="Spectra" /><Parameter format="str" id="191112" name="path" value="/home/nanosat/john" /><Parameter format="date" id="191113" name="startDate" value="2017/09/03" /><Parameter format="date" id="191114" name="endDate" value="2017/09/03" /><Parameter format="time" id="191115" name="startTime" value="00:00:00" /><Parameter format="time" id="191116" name="endTime" value="23:59:59" /><Parameter format="int" id="191118" name="cursor" value="7" /><Parameter format="int" id="191119" name="skip" value="3" /><Parameter format="int" id="191120" name="walk" value="1" /><Parameter format="int" id="191121" name="online" value="0" /></Operation></ReadUnit><ProcUnit datatype="SpectraProc" id="1912" inputId="1911" name="SpectraProc"><Operation id="19121" name="run" priority="1" type="self"><Parameter format="int" id="191211" name="nProfiles" value="860" /><Parameter format="int" id="191212" name="nFFTPoints" value="8" /></Operation><Operation id="19122" name="PublishData" priority="2" type="other"><Parameter format="int" id="191221" name="zeromq" value="1" /><Parameter format="bool" id="191222" name="verbose" value="0" /></Operation></ProcUnit></Project>
\ No newline at end of file