Merge pull request #44 from RapidScada/develop

Merge Develop to Master

Config/DefaultMono/SCADA/ScadaComm/Config/ScadaCommSvcConfig.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScadaCommSvcConfig>
+  <!--Common Parameters-->
+  <CommonParams>
+    <Param name="ServerUse" value="true" descr="Use SCADA-Server" />
+    <Param name="ServerHost" value="localhost" descr="SCADA-Server host or IP address" />
+    <Param name="ServerPort" value="10000" descr="SCADA-Server TCP port number" />
+    <Param name="ServerUser" value="ScadaComm" descr="User name for the connection to SCADA-Server" />
+    <Param name="ServerPwd" value="12345" descr="User password for the connection to SCADA-Server" />
+    <Param name="ServerTimeout" value="10000" descr="SCADA-Server response timeout, ms" />
+    <Param name="WaitForStop" value="10000" descr="Waiting for the communication lines temrination, ms" />
+    <Param name="SendAllDataPer" value="60" descr="Sending all device data period, sec" />
+  </CommonParams>
+  <!--Communication Lines-->
+  <CommLines>
+    <!--Line 1-->
+    <CommLine active="true" bind="true" number="1" name="Modbus">
+      <CommChannel type="TcpClient">
+        <Param name="Behavior" value="Master" />
+        <Param name="ConnMode" value="Individual" />
+        <Param name="IpAddress" value="" />
+        <Param name="TcpPort" value="502" />
+      </CommChannel>
+      <LineParams>
+        <Param name="ReqTriesCnt" value="3" descr="Device request retries count on error" />
+        <Param name="CycleDelay" value="0" descr="Delay after request cycle, ms" />
+        <Param name="CmdEnabled" value="true" descr="Commands enabled" />
+        <Param name="DetailedLog" value="true" descr="Write detailed information to the log" />
+      </LineParams>
+      <CustomParams>
+        <Param name="TransMode" value="TCP" />
+      </CustomParams>
+      <ReqSequence>
+        <KP active="true" bind="true" number="11" name="ADAM-6015 Server room" dll="KpModbus.dll" address="1" callNum="127.0.0.1" timeout="1000" delay="200" time="00:00:00" period="00:00:00" cmdLine="KpModbus_Adam6015.xml" />
+      </ReqSequence>
+    </CommLine>
+    <!--Line 2-->
+    <CommLine active="false" bind="true" number="2" name="OPC">
+      <CommChannel type="" />
+      <LineParams>
+        <Param name="ReqTriesCnt" value="3" descr="Device request retries count on error" />
+        <Param name="CycleDelay" value="0" descr="Delay after request cycle, ms" />
+        <Param name="CmdEnabled" value="false" descr="Commands enabled" />
+        <Param name="DetailedLog" value="true" descr="Write detailed information to the log" />
+      </LineParams>
+      <CustomParams />
+      <ReqSequence>
+        <KP active="true" bind="true" number="21" name="OPC Demo" dll="KpOpc.dll" address="0" callNum="" timeout="0" delay="200" time="00:00:00" period="00:00:00" cmdLine="" />
+      </ReqSequence>
+    </CommLine>
+    <!--Line 3-->
+    <CommLine active="true" bind="true" number="3" name="GSM">
+      <CommChannel type="Serial">
+        <Param name="BaudRate" value="19200" />
+        <Param name="Behavior" value="Master" />
+        <Param name="DataBits" value="8" />
+        <Param name="DtrEnable" value="False" />
+        <Param name="Parity" value="None" />
+        <Param name="PortName" value="/dev/ttyUSB0" />
+        <Param name="RtsEnable" value="False" />
+        <Param name="StopBits" value="One" />
+      </CommChannel>
+      <LineParams>
+        <Param name="ReqTriesCnt" value="3" descr="Device request retries count on error" />
+        <Param name="CycleDelay" value="0" descr="Delay after request cycle, ms" />
+        <Param name="CmdEnabled" value="true" descr="Commands enabled" />
+        <Param name="DetailedLog" value="true" descr="Write detailed information to the log" />
+      </LineParams>
+      <CustomParams />
+      <ReqSequence>
+        <KP active="true" bind="true" number="31" name="Cinterion MC52iT" dll="KpSms.dll" address="0" callNum="+01234567890" timeout="5000" delay="500" time="00:00:00" period="00:00:00" cmdLine="" />
+      </ReqSequence>
+    </CommLine>
+    <!--Line 4-->
+    <CommLine active="true" bind="true" number="4" name="Email">
+      <CommChannel type="" />
+      <LineParams>
+        <Param name="ReqTriesCnt" value="3" descr="Device request retries count on error" />
+        <Param name="CycleDelay" value="0" descr="Delay after request cycle, ms" />
+        <Param name="CmdEnabled" value="true" descr="Commands enabled" />
+        <Param name="DetailedLog" value="true" descr="Write detailed information to the log" />
+      </LineParams>
+      <CustomParams />
+      <ReqSequence>
+        <KP active="true" bind="true" number="41" name="Email sender" dll="KpEmail.dll" address="0" callNum="" timeout="10000" delay="200" time="00:00:00" period="00:00:00" cmdLine="" />
+      </ReqSequence>
+    </CommLine>
+    <!--Line 5-->
+    <CommLine active="true" bind="true" number="5" name="SNMP">
+      <CommChannel type="" />
+      <LineParams>
+        <Param name="ReqTriesCnt" value="3" descr="Device request retries count on error" />
+        <Param name="CycleDelay" value="0" descr="Delay after request cycle, ms" />
+        <Param name="CmdEnabled" value="false" descr="Commands enabled" />
+        <Param name="DetailedLog" value="true" descr="Write detailed information to the log" />
+      </LineParams>
+      <CustomParams />
+      <ReqSequence>
+        <KP active="true" bind="true" number="51" name="Local PC" dll="KpSnmp.dll" address="0" callNum="127.0.0.1" timeout="1000" delay="200" time="00:00:00" period="00:00:00" cmdLine="" />
+      </ReqSequence>
+    </CommLine>
+  </CommLines>
+</ScadaCommSvcConfig>

Config/DefaultMono/SCADA/ScadaServer/Config/ScadaServerSvcConfig.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScadaServerSvcConfig>
+  <!--Common Parameters-->
+  <CommonParams>
+    <Param name="TcpPort" value="10000" descr="TCP port number" />
+    <Param name="UseAD" value="false" descr="Use Active Directory for users authentication" />
+    <Param name="LdapPath" value="LDAP://server" descr="Domain controller server path" />
+    <Param name="DetailedLog" value="false" descr="Write detailed information to the log" />
+  </CommonParams>
+  <!--Directories-->
+  <Directories>
+    <Param name="BaseDATDir" value="../BaseDAT/" descr="The configuration database in DAT format directory" />
+    <Param name="ItfDir" value="../Interface/" descr="The interface directory" />
+    <Param name="ArcDir" value="../ArchiveDAT/" descr="The archive in DAT format directory" />
+    <Param name="ArcCopyDir" value="../ArchiveDATCopy/" descr="The archive copy in DAT format directory" />
+  </Directories>
+  <!--Saving Parameters-->
+  <SaveParams>
+    <Param name="WriteCurPer" value="1" descr="Current data writing period, sec" />
+    <Param name="InactUnrelTime" value="5" descr="Unreliable on inactivity, min" />
+    <Param name="WriteCur" value="true" descr="Write current data" />
+    <Param name="WriteCurCopy" value="false" descr="Write current data copy" />
+    <Param name="WriteMinPer" value="60" descr="Minute data writing period, sec" />
+    <Param name="StoreMinPer" value="365" descr="Minute data storing period, days" />
+    <Param name="WriteMin" value="true" descr="Write minute data" />
+    <Param name="WriteMinCopy" value="false" descr="Write minute data copy" />
+    <Param name="WriteHrPer" value="60" descr="Hourly data writing period, min" />
+    <Param name="StoreHrPer" value="365" descr="Hourly data storing period, days" />
+    <Param name="WriteHr" value="true" descr="Write hourly data" />
+    <Param name="WriteHrCopy" value="false" descr="Write hourly data copy" />
+    <Param name="StoreEvPer" value="365" descr="Events storing period, days" />
+    <Param name="WriteEv" value="true" descr="Write events" />
+    <Param name="WriteEvCopy" value="false" descr="Write events copy" />
+  </SaveParams>
+  <!--Modules-->
+  <Modules />
+</ScadaServerSvcConfig>

Config/DefaultMono/SCADA/ScadaWeb/config/WebSettings.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WebSettings>
+  <CommSettings>
+    <Param name="ServerHost" value="localhost" descr="SCADA-Server host or IP address" />
+    <Param name="ServerPort" value="10000" descr="SCADA-Server TCP port number" />
+    <Param name="ServerUser" value="ScadaWeb" descr="User name for the connection" />
+    <Param name="ServerPwd" value="12345" descr="User password for the connection" />
+    <Param name="ServerTimeout" value="10000" descr="Response timeout, ms" />
+  </CommSettings>
+  <CommonParams>
+    <Param name="Culture" value="" descr="Web application culture" />
+    <Param name="DataRefrRate" value="2000" descr="Current data and events refresh rate, ms" />
+    <Param name="ArcRefrRate" value="10000" descr="Archive data refresh rate, ms" />
+    <Param name="DispEventCnt" value="100" descr="Display events count" />
+    <Param name="ChartGap" value="90" descr="Distance between chart points to make a gap, sec" />
+    <Param name="StartPage" value="" descr="Start page after login" />
+    <Param name="CmdEnabled" value="true" descr="Enable commands" />
+    <Param name="CmdPassword" value="true" descr="Require password to send command" />
+    <Param name="RemEnabled" value="true" descr="Allow to remember logged on user" />
+    <Param name="ViewsFromBase" value="true" descr="Load view settings from the database" />
+    <Param name="ShareStats" value="true" descr="Share depersonalized stats with the developers" />
+  </CommonParams>
+  <ScriptPaths>
+    <Script name="ChartScript" path="~/plugins/Chart/js/chartdialog.js" />
+    <Script name="CmdScript" path="~/plugins/Table/js/cmddialog.js" />
+    <Script name="EventAckScript" path="~/plugins/Table/js/eventackdialog.js" />
+  </ScriptPaths>
+  <Plugins>
+    <Plugin fileName="PlgChart.dll" />
+    <Plugin fileName="PlgConfig.dll" />
+    <Plugin fileName="PlgRegistration.dll" />
+    <Plugin fileName="PlgScheme.dll" />
+    <Plugin fileName="PlgStore.dll" />
+    <Plugin fileName="PlgTable.dll" />
+    <Plugin fileName="PlgWebPage.dll" />
+  </Plugins>
+</WebSettings>

Config/DefaultMono/SCADA/scadarestart.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+echo "Restarting Rapid SCADA..."
+sudo service scadacomm stop
+sudo service scadaserver stop
+sudo service scadaserver start
+sudo service scadacomm start

Config/DefaultMono/SCADA/scadastart.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+echo "Starting Rapid SCADA..."
+sudo service scadaserver start
+sudo service scadacomm start

Config/DefaultMono/SCADA/scadastop.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+echo "Terminating Rapid SCADA..."
+sudo service scadacomm stop
+sudo service scadaserver stop

Config/DefaultMono/SCADA/svc_install.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+cd /etc/init.d
+sudo chmod +x ./scadaserver
+sudo update-rc.d scadaserver defaults
+sudo chmod +x ./scadacomm
+sudo update-rc.d scadacomm defaults

Config/DefaultMono/SCADA/svc_uninstall.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+sudo update-rc.d -f scadaserver remove
+sudo update-rc.d -f scadacomm remove

Config/DefaultMono/SCADA/webrestart.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+sudo service mono-xsp4 restart

LangPack/readme.txt

@@ -0,0 +1,7 @@
+Language Installation
+---------------------
+1. Choose the language and open the appropriate folder of the language pack.
+2. Copy the language files from the folder SCADA of the language pack to the installation directory of Rapid SCADA maintaining the hierarchy of the directories. 
+3. Run SCADA-Administrator application.
+4. Go to Settings -> Language and type the culture name, e.g. es-LA, and click OK button.
+5. Restart Rapid SCADA applications to apply changes.