From 715b2cf0183b6bf2b02632f1753d1f89747511ff Mon Sep 17 00:00:00 2001
From: Leonardo Sala <leonardo.sala@psi.ch>
Date: Tue, 3 May 2016 10:10:45 +0200
Subject: [PATCH] Startup

---
 config/config.properties  | 6 +++++-
 config/devices.properties | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/config.properties b/config/config.properties
index b8648db..58ed1ef 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,17 +1,21 @@
-#Wed Jan 20 16:39:29 CET 2016
+#Tue May 03 10:10:39 CEST 2016
 autoSaveScanData=true
 createSessionFiles=false
+dataLayout=default
 dataPath={data}/{year}_{month}/{date}/{date}_{time}_{exec}
 dataProvider=default
 dataScanFlushRecords=true
 dataScanStrategy=default
+dataServerPort=-1
 devicePoolFile={config}/devices.properties
 deviceUpdateStrategyFile={config}/update.properties
 imageSourcesFile={config}/imaging.properties
+instanceName=
 logDaysToLive=-1
 logLevel=Info
 logLevelConsole=Off
 logPath={logs}/{date}_{time}
+scanStreamerPort=-1
 serverEnabled=false
 serverPort=8080
 simulation=false
diff --git a/config/devices.properties b/config/devices.properties
index e68a45f..51e72c7 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -24,3 +24,4 @@ bm2try=ch.psi.pshell.epics.Motor|X12SA-OP-BM2:TRY1|||true
 bm3trx=ch.psi.pshell.epics.Motor|X12SA-OP-BM3:TRX1|||true
 bm3try=ch.psi.pshell.epics.Motor|X12SA-OP-BM3:TRY1|||true
 sdev1=ch.psi.pshell.serial.SerialPortDevice||||
+scaler=ch.psi.pshell.epics.Scaler|X12SA-ES1-SCALER|||