Skip to content

Commit

Permalink
Merge branch 'release/V1.2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
langstonb committed Dec 1, 2022
2 parents ede1859 + c3a0adc commit d01f51f
Show file tree
Hide file tree
Showing 363 changed files with 13,294 additions and 2,848 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*.py filter=tabspace
*.st filter=tabspace
*.c filter=tabspace
*.h filter=tabspace
*.cpp filter=tabspace
*.hpp filter=tabspace
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@
~*
*.[Bb]ak
*.[Oo]rig

#ignore windows files
desktop.ini
207 changes: 207 additions & 0 deletions mappFramework/Diagnosis/Simulation/PC/AlarmMgr.PVM

Large diffs are not rendered by default.

22 changes: 22 additions & 0 deletions mappFramework/Diagnosis/Simulation/PC/BackupMgr.PVM
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
WATCH Ver=2.00 PLCName=PLC1 CPUName=CPU TaskName=BackupMgr
Position X=0 Y=0 Width=0 Height=0 TabWidth Name=200 Type=100 Scope=60 Force=60 Index=1 ASCIIString=0
name type force value level type len format place expand specs
MpFileManagerUIConnect MpFileManagerUIConnectType 0 " *" 0 24 1 0 1 1
DeviceList MpFileManagerUIDeviceListType 0 " *" 1 24 1 0 0 1
DeviceNames STRING[50][0..9] 0 " *" 2 9 51 0 0 1
DeviceNames[0] STRING[50] 0 " 'mappBackupFiles'" 3 9 51 1 0 0
DeviceNames[1] STRING[50] 0 " ''" 3 9 51 1 0 0
DeviceNames[2] STRING[50] 0 " ''" 3 9 51 1 0 0
DeviceNames[3] STRING[50] 0 " ''" 3 9 51 1 0 0
DeviceNames[4] STRING[50] 0 " ''" 3 9 51 1 0 0
DeviceNames[5] STRING[50] 0 " ''" 3 9 51 1 0 0
DeviceNames[6] STRING[50] 0 " ''" 3 9 51 1 0 0
DeviceNames[7] STRING[50] 0 " ''" 3 9 51 1 0 0
DeviceNames[8] STRING[50] 0 " ''" 3 9 51 1 0 0
DeviceNames[9] STRING[50] 0 " ''" 3 9 51 1 0 0
SelectedIndex UINT 0 " 0" 2 6 1 10 0 0
HmiBackup BackupHmiInterfaceType 0 " *" 0 24 1 0 1 1
Status BackupHmiStatusType 0 " *" 1 24 1 0 0 1
TableConfig STRING[120][0..1] 0 " *" 2 9 121 0 0 1
TableConfig[0] STRING[120] 0 " '{ "specRows": [{"from":1,"to":9, "visible":false}]}'" 3 9 121 1 0 0
TableConfig[1] STRING[120] 0 " '{ "specRows": [{"from":0,"to":50, "visible":false}]}'" 3 9 121 1 0 0
782 changes: 782 additions & 0 deletions mappFramework/Diagnosis/Simulation/PC/ReportMgr.PVM

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion mappFramework/Logical/ChineseHelp/Package.pkg
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<?AutomationStudio FileVersion="4.9"?>
<Package xmlns="http://br-automation.co.at/AS/Package">
<Objects>
<Object Type="File">mappFramwork.chm</Object>
<Object Type="File">mappFramework.chm</Object>
</Objects>
</Package>
Binary file not shown.
Binary file removed mappFramework/Logical/ChineseHelp/mappFramwork.chm
Binary file not shown.
204 changes: 102 additions & 102 deletions mappFramework/Logical/Infrastructure/AlarmX/AlarmMgr/AlarmHandling.st
Original file line number Diff line number Diff line change
@@ -1,120 +1,120 @@
ACTION AlarmHandling:

// CommissioningModeActive = TRUE will inhibit Alarms[0]. The alarm will not trigger even if the alarm condition is active.
// CommissioningModeActive = TRUE will inhibit Alarms[0]. The alarm will not trigger even if the alarm condition is active.
// CommissioningModeActive = FALSE will NOT inhibit Alarms[0]. The alarm will trigger when the alarm condition is active.
// See Alarm.mpalarmxcore (must enable Advanced Features)
CommissioningModeActive;
CommissioningModeActive;

// Define the condition which triggers each alarm below.
Alarms[0];

// Alarms[1] := ;
// Alarms[2] := ;
// Alarms[3] := ;
// Alarms[4] := ;
// Alarms[5] := ;
// Alarms[6] := ;
// Alarms[7] := ;
// Alarms[8] := ;
// Alarms[9] := ;
// Alarms[1] := ;
// Alarms[2] := ;
// Alarms[3] := ;
// Alarms[4] := ;
// Alarms[5] := ;
// Alarms[6] := ;
// Alarms[7] := ;
// Alarms[8] := ;
// Alarms[9] := ;
//
// Alarms[10] := ;
// Alarms[11] := ;
// Alarms[12] := ;
// Alarms[13] := ;
// Alarms[14] := ;
// Alarms[15] := ;
// Alarms[16] := ;
// Alarms[17] := ;
// Alarms[18] := ;
// Alarms[19] := ;
// Alarms[10] := ;
// Alarms[11] := ;
// Alarms[12] := ;
// Alarms[13] := ;
// Alarms[14] := ;
// Alarms[15] := ;
// Alarms[16] := ;
// Alarms[17] := ;
// Alarms[18] := ;
// Alarms[19] := ;
//
// Alarms[20] := ;
// Alarms[21] := ;
// Alarms[22] := ;
// Alarms[23] := ;
// Alarms[24] := ;
// Alarms[25] := ;
// Alarms[26] := ;
// Alarms[27] := ;
// Alarms[28] := ;
// Alarms[29] := ;
// Alarms[20] := ;
// Alarms[21] := ;
// Alarms[22] := ;
// Alarms[23] := ;
// Alarms[24] := ;
// Alarms[25] := ;
// Alarms[26] := ;
// Alarms[27] := ;
// Alarms[28] := ;
// Alarms[29] := ;
//
// Alarms[30] := ;
// Alarms[31] := ;
// Alarms[32] := ;
// Alarms[33] := ;
// Alarms[34] := ;
// Alarms[35] := ;
// Alarms[36] := ;
// Alarms[37] := ;
// Alarms[38] := ;
// Alarms[39] := ;
// Alarms[30] := ;
// Alarms[31] := ;
// Alarms[32] := ;
// Alarms[33] := ;
// Alarms[34] := ;
// Alarms[35] := ;
// Alarms[36] := ;
// Alarms[37] := ;
// Alarms[38] := ;
// Alarms[39] := ;
//
// Alarms[40] := ;
// Alarms[41] := ;
// Alarms[42] := ;
// Alarms[43] := ;
// Alarms[44] := ;
// Alarms[45] := ;
// Alarms[46] := ;
// Alarms[47] := ;
// Alarms[48] := ;
// Alarms[49] := ;
// Alarms[40] := ;
// Alarms[41] := ;
// Alarms[42] := ;
// Alarms[43] := ;
// Alarms[44] := ;
// Alarms[45] := ;
// Alarms[46] := ;
// Alarms[47] := ;
// Alarms[48] := ;
// Alarms[49] := ;
//
// Alarms[50] := ;
// Alarms[51] := ;
// Alarms[52] := ;
// Alarms[53] := ;
// Alarms[54] := ;
// Alarms[55] := ;
// Alarms[56] := ;
// Alarms[57] := ;
// Alarms[58] := ;
// Alarms[59] := ;
// Alarms[50] := ;
// Alarms[51] := ;
// Alarms[52] := ;
// Alarms[53] := ;
// Alarms[54] := ;
// Alarms[55] := ;
// Alarms[56] := ;
// Alarms[57] := ;
// Alarms[58] := ;
// Alarms[59] := ;
//
// Alarms[60] := ;
// Alarms[61] := ;
// Alarms[62] := ;
// Alarms[63] := ;
// Alarms[64] := ;
// Alarms[65] := ;
// Alarms[66] := ;
// Alarms[67] := ;
// Alarms[68] := ;
// Alarms[69] := ;
// Alarms[60] := ;
// Alarms[61] := ;
// Alarms[62] := ;
// Alarms[63] := ;
// Alarms[64] := ;
// Alarms[65] := ;
// Alarms[66] := ;
// Alarms[67] := ;
// Alarms[68] := ;
// Alarms[69] := ;
//
// Alarms[70] := ;
// Alarms[71] := ;
// Alarms[72] := ;
// Alarms[73] := ;
// Alarms[74] := ;
// Alarms[75] := ;
// Alarms[76] := ;
// Alarms[77] := ;
// Alarms[78] := ;
// Alarms[79] := ;
// Alarms[70] := ;
// Alarms[71] := ;
// Alarms[72] := ;
// Alarms[73] := ;
// Alarms[74] := ;
// Alarms[75] := ;
// Alarms[76] := ;
// Alarms[77] := ;
// Alarms[78] := ;
// Alarms[79] := ;
//
// Alarms[80] := ;
// Alarms[81] := ;
// Alarms[82] := ;
// Alarms[83] := ;
// Alarms[84] := ;
// Alarms[85] := ;
// Alarms[86] := ;
// Alarms[87] := ;
// Alarms[88] := ;
// Alarms[89] := ;
// Alarms[80] := ;
// Alarms[81] := ;
// Alarms[82] := ;
// Alarms[83] := ;
// Alarms[84] := ;
// Alarms[85] := ;
// Alarms[86] := ;
// Alarms[87] := ;
// Alarms[88] := ;
// Alarms[89] := ;
//
// Alarms[90] := ;
// Alarms[91] := ;
// Alarms[92] := ;
// Alarms[93] := ;
// Alarms[94] := ;
// Alarms[95] := ;
// Alarms[96] := ;
// Alarms[97] := ;
// Alarms[98] := ;
// Alarms[99] := ;
// Alarms[90] := ;
// Alarms[91] := ;
// Alarms[92] := ;
// Alarms[93] := ;
// Alarms[94] := ;
// Alarms[95] := ;
// Alarms[96] := ;
// Alarms[97] := ;
// Alarms[98] := ;
// Alarms[99] := ;

END_ACTION
Loading

0 comments on commit d01f51f

Please sign in to comment.