Skip to content

Commit

Permalink
Merge pull request #70 from RapidScada/develop
Browse files Browse the repository at this point in the history
Merge Develop to Master
  • Loading branch information
2mik authored Dec 26, 2018
2 parents 4c81d1c + 84d9379 commit 417d0e2
Show file tree
Hide file tree
Showing 840 changed files with 43,359 additions and 2,195 deletions.
Binary file modified Base/data/ScadaBase_5.0_en.sdf
Binary file not shown.
Binary file modified Base/data/ScadaBase_5.0_ru.sdf
Binary file not shown.
18 changes: 18 additions & 0 deletions Config/EmptyProject.en-GB/BaseXML/CmdType.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<ArrayOfCmdType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<CmdType>
<CmdTypeID>0</CmdTypeID>
<Name>Standard</Name>
<Descr>Standard command. Command parameter is a float number</Descr>
</CmdType>
<CmdType>
<CmdTypeID>1</CmdTypeID>
<Name>Binary</Name>
<Descr>Binary command. Command parameters are custom data</Descr>
</CmdType>
<CmdType>
<CmdTypeID>2</CmdTypeID>
<Name>Request</Name>
<Descr>Out of order device request</Descr>
</CmdType>
</ArrayOfCmdType>
33 changes: 33 additions & 0 deletions Config/EmptyProject.en-GB/BaseXML/CmdVal.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<ArrayOfCmdVal xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<CmdVal>
<CmdValID>1</CmdValID>
<Name>Off</Name>
<Val>Off</Val>
</CmdVal>
<CmdVal>
<CmdValID>2</CmdValID>
<Name>On</Name>
<Val>; On</Val>
</CmdVal>
<CmdVal>
<CmdValID>3</CmdValID>
<Name>Off - On</Name>
<Val>Off; On</Val>
</CmdVal>
<CmdVal>
<CmdValID>4</CmdValID>
<Name>Execute</Name>
<Val>; Execute</Val>
</CmdVal>
<CmdVal>
<CmdValID>5</CmdValID>
<Name>Disarm - Arm</Name>
<Val>Disarm; Arm</Val>
</CmdVal>
<CmdVal>
<CmdValID>6</CmdValID>
<Name>Alarm commands 1</Name>
<Val>Disarm; Arm; Off; On; Reset; Start</Val>
</CmdVal>
</ArrayOfCmdVal>
57 changes: 57 additions & 0 deletions Config/EmptyProject.en-GB/BaseXML/CnlType.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="utf-8"?>
<ArrayOfCnlType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<CnlType>
<CnlTypeID>1</CnlTypeID>
<Name>Discrete</Name>
<ShtName>Discrete</ShtName>
<Descr>Channel values are discrete</Descr>
</CnlType>
<CnlType>
<CnlTypeID>2</CnlTypeID>
<Name>Real</Name>
<ShtName>Real</ShtName>
<Descr>Channel values are real numbers</Descr>
</CnlType>
<CnlType>
<CnlTypeID>3</CnlTypeID>
<Name>Calculated real</Name>
<ShtName>CalcReal</ShtName>
<Descr>Real value of a channel is calculated using the formula</Descr>
</CnlType>
<CnlType>
<CnlTypeID>4</CnlTypeID>
<Name>Minute real</Name>
<ShtName>MinReal</ShtName>
<Descr>Real value of a channel is calculated using the formula once in every minute</Descr>
</CnlType>
<CnlType>
<CnlTypeID>5</CnlTypeID>
<Name>Hourly real</Name>
<ShtName>HourReal</ShtName>
<Descr>Real value of a channel is calculated using the formula once in every hour</Descr>
</CnlType>
<CnlType>
<CnlTypeID>6</CnlTypeID>
<Name>Switching counter</Name>
<ShtName>SwCntr</ShtName>
<Descr>Switching counter. Counts transitions over 0 of a value calculated using the formula</Descr>
</CnlType>
<CnlType>
<CnlTypeID>7</CnlTypeID>
<Name>Calculated discrete</Name>
<ShtName>CalcDiscrete</ShtName>
<Descr>Discrete value of a channel is calculated using the formula</Descr>
</CnlType>
<CnlType>
<CnlTypeID>8</CnlTypeID>
<Name>Minute discrete</Name>
<ShtName>MinDiscrete</ShtName>
<Descr>Discrete value of a channel is calculated using the formula once in every minute</Descr>
</CnlType>
<CnlType>
<CnlTypeID>9</CnlTypeID>
<Name>Hourly discrete</Name>
<ShtName>HourDiscrete</ShtName>
<Descr>Discrete value of a channel is calculated using the formula once in every hour</Descr>
</CnlType>
</ArrayOfCnlType>
105 changes: 105 additions & 0 deletions Config/EmptyProject.en-GB/BaseXML/EvType.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<ArrayOfEvType xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<EvType>
<CnlStatus>0</CnlStatus>
<Name>Undefined</Name>
<Color>Black</Color>
<Descr>Channel value is undefined</Descr>
</EvType>
<EvType>
<CnlStatus>1</CnlStatus>
<Name>Defined</Name>
<Color>Black</Color>
<Descr>Channel value is defined</Descr>
</EvType>
<EvType>
<CnlStatus>2</CnlStatus>
<Name>Archival</Name>
<Color>Green</Color>
<Descr>Channel value has been received by the server as archival</Descr>
</EvType>
<EvType>
<CnlStatus>3</CnlStatus>
<Name>Formula error</Name>
<Color>Silver</Color>
<Descr>Error calculating channel value using the formula</Descr>
</EvType>
<EvType>
<CnlStatus>4</CnlStatus>
<Name>Changed</Name>
<Color>Black</Color>
<Descr>Channel value has been changed and it is defined</Descr>
</EvType>
<EvType>
<CnlStatus>5</CnlStatus>
<Name>Unreliable</Name>
<Color>Silver</Color>
<Descr>Channel value is defined but unreliable</Descr>
</EvType>
<EvType>
<CnlStatus>11</CnlStatus>
<Name>Alarm low</Name>
<Color>Blue</Color>
<Descr>Channel value is less than the lower alarm limit</Descr>
</EvType>
<EvType>
<CnlStatus>12</CnlStatus>
<Name>Low</Name>
<Color>Cyan</Color>
<Descr>Channel value is less than the lower limit</Descr>
</EvType>
<EvType>
<CnlStatus>13</CnlStatus>
<Name>Normal</Name>
<Color>Black</Color>
<Descr>Channel value is inside the limits</Descr>
</EvType>
<EvType>
<CnlStatus>14</CnlStatus>
<Name>High</Name>
<Color>Orange</Color>
<Descr>Channel value is greater than the upper limit</Descr>
</EvType>
<EvType>
<CnlStatus>15</CnlStatus>
<Name>Alarm high</Name>
<Color>Red</Color>
<Descr>Channel value is greater than the upper alarm limit</Descr>
</EvType>
<EvType>
<CnlStatus>101</CnlStatus>
<Name>Input permitted</Name>
<Color>Green</Color>
</EvType>
<EvType>
<CnlStatus>102</CnlStatus>
<Name>Output permitted</Name>
<Color>Orange</Color>
<Descr />
</EvType>
<EvType>
<CnlStatus>103</CnlStatus>
<Name>Access denied</Name>
<Color>Red</Color>
</EvType>
<EvType>
<CnlStatus>111</CnlStatus>
<Name>Wire break</Name>
<Color>Orange</Color>
</EvType>
<EvType>
<CnlStatus>112</CnlStatus>
<Name>Disarmed</Name>
<Color>Navy</Color>
</EvType>
<EvType>
<CnlStatus>113</CnlStatus>
<Name>Armed</Name>
<Color>Green</Color>
</EvType>
<EvType>
<CnlStatus>114</CnlStatus>
<Name>Alarm</Name>
<Color>Red</Color>
</EvType>
</ArrayOfEvType>
81 changes: 81 additions & 0 deletions Config/EmptyProject.en-GB/BaseXML/Format.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<ArrayOfFormat xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Format>
<FormatID>0</FormatID>
<Name>D</Name>
<ShowNumber>true</ShowNumber>
<DecDigits>0</DecDigits>
</Format>
<Format>
<FormatID>1</FormatID>
<Name>D.D</Name>
<ShowNumber>true</ShowNumber>
<DecDigits>1</DecDigits>
</Format>
<Format>
<FormatID>2</FormatID>
<Name>D.DD</Name>
<ShowNumber>true</ShowNumber>
<DecDigits>2</DecDigits>
</Format>
<Format>
<FormatID>3</FormatID>
<Name>D.DDD</Name>
<ShowNumber>true</ShowNumber>
<DecDigits>3</DecDigits>
</Format>
<Format>
<FormatID>4</FormatID>
<Name>D.DDDD</Name>
<ShowNumber>true</ShowNumber>
<DecDigits>4</DecDigits>
</Format>
<Format>
<FormatID>5</FormatID>
<Name>D.DDDDD</Name>
<ShowNumber>true</ShowNumber>
<DecDigits>5</DecDigits>
</Format>
<Format>
<FormatID>6</FormatID>
<Name>D.DDDDDD</Name>
<ShowNumber>true</ShowNumber>
<DecDigits>6</DecDigits>
</Format>
<Format>
<FormatID>10</FormatID>
<Name>Enum text</Name>
<ShowNumber>false</ShowNumber>
<DecDigits>0</DecDigits>
</Format>
<Format>
<FormatID>11</FormatID>
<Name>ASCII text</Name>
<ShowNumber>false</ShowNumber>
<DecDigits>0</DecDigits>
</Format>
<Format>
<FormatID>12</FormatID>
<Name>Unicode text</Name>
<ShowNumber>false</ShowNumber>
<DecDigits>0</DecDigits>
</Format>
<Format>
<FormatID>13</FormatID>
<Name>Date and time</Name>
<ShowNumber>false</ShowNumber>
<DecDigits>0</DecDigits>
</Format>
<Format>
<FormatID>14</FormatID>
<Name>Date</Name>
<ShowNumber>false</ShowNumber>
<DecDigits>0</DecDigits>
</Format>
<Format>
<FormatID>15</FormatID>
<Name>Time</Name>
<ShowNumber>false</ShowNumber>
<DecDigits>0</DecDigits>
</Format>
</ArrayOfFormat>
Loading

0 comments on commit 417d0e2

Please sign in to comment.