maier_st/Sharp7
1
0
Fork 0
mirror of https://github.com/fbarresi/Sharp7.git synced 2026-02-04 08:42:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added usage of overloaded methods with enums instead of constants

Browse Source
This commit is contained in:
Federico Barresi
2020-06-05 22:07:42 +02:00
parent c33a838144
commit de795802ac
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Sharp7/S7Client.cs
View File

@@ -1314,48 +1314,48 @@ namespace Sharp7
public int DBRead(int DBNumber, int Start, int Size, byte[] Buffer) public int DBRead(int DBNumber, int Start, int Size, byte[] Buffer)
{ {
return ReadArea(S7Consts.S7AreaDB, DBNumber, Start, Size, S7Consts.S7WLByte, Buffer); return ReadArea(S7Area.DB, DBNumber, Start, Size, S7WordLength.Byte, Buffer);
} }
public int DBWrite(int DBNumber, int Start, int Size, byte[] Buffer) public int DBWrite(int DBNumber, int Start, int Size, byte[] Buffer)
{ {
return WriteArea(S7Consts.S7AreaDB, DBNumber, Start, Size, S7Consts.S7WLByte, Buffer); return WriteArea(S7Area.DB, DBNumber, Start, Size, S7WordLength.Byte, Buffer);
} }
public int MBRead(int Start, int Size, byte[] Buffer) public int MBRead(int Start, int Size, byte[] Buffer)
{ {
return ReadArea(S7Consts.S7AreaMK, 0, Start, Size, S7Consts.S7WLByte, Buffer); return ReadArea(S7Area.MK, 0, Start, Size, S7WordLength.Byte, Buffer);
} }
public int MBWrite(int Start, int Size, byte[] Buffer) public int MBWrite(int Start, int Size, byte[] Buffer)
{ {
return WriteArea(S7Consts.S7AreaMK, 0, Start, Size, S7Consts.S7WLByte, Buffer); return WriteArea(S7Area.MK, 0, Start, Size, S7WordLength.Byte, Buffer);
} }
public int EBRead(int Start, int Size, byte[] Buffer) public int EBRead(int Start, int Size, byte[] Buffer)
{ {
return ReadArea(S7Consts.S7AreaPE, 0, Start, Size, S7Consts.S7WLByte, Buffer); return ReadArea(S7Area.PE, 0, Start, Size, S7WordLength.Byte, Buffer);
} }
public int EBWrite(int Start, int Size, byte[] Buffer) public int EBWrite(int Start, int Size, byte[] Buffer)
{ {
return WriteArea(S7Consts.S7AreaPE, 0, Start, Size, S7Consts.S7WLByte, Buffer); return WriteArea(S7Area.PE, 0, Start, Size, S7WordLength.Byte, Buffer);
} }
public int ABRead(int Start, int Size, byte[] Buffer) public int ABRead(int Start, int Size, byte[] Buffer)
{ {
return ReadArea(S7Consts.S7AreaPA, 0, Start, Size, S7Consts.S7WLByte, Buffer); return ReadArea(S7Area.PA, 0, Start, Size, S7WordLength.Byte, Buffer);
} }
public int ABWrite(int Start, int Size, byte[] Buffer) public int ABWrite(int Start, int Size, byte[] Buffer)
{ {
return WriteArea(S7Consts.S7AreaPA, 0, Start, Size, S7Consts.S7WLByte, Buffer); return WriteArea(S7Area.PA, 0, Start, Size, S7WordLength.Byte, Buffer);
} }
public int TMRead(int Start, int Amount, ushort[] Buffer) public int TMRead(int Start, int Amount, ushort[] Buffer)
{ {
byte[] sBuffer = new byte[Amount * 2]; byte[] sBuffer = new byte[Amount * 2];
int Result = ReadArea(S7Consts.S7AreaTM, 0, Start, Amount, S7Consts.S7WLTimer, sBuffer); int Result = ReadArea(S7Area.TM, 0, Start, Amount, S7WordLength.Timer, sBuffer);
if (Result == 0) if (Result == 0)
{ {
for (int c = 0; c < Amount; c++) for (int c = 0; c < Amount; c++)
@@ -1374,13 +1374,13 @@ namespace Sharp7
sBuffer[c * 2 + 1] = (byte)((Buffer[c] & 0xFF00) >> 8); sBuffer[c * 2 + 1] = (byte)((Buffer[c] & 0xFF00) >> 8);
sBuffer[c * 2] = (byte)(Buffer[c] & 0x00FF); sBuffer[c * 2] = (byte)(Buffer[c] & 0x00FF);
} }
return WriteArea(S7Consts.S7AreaTM, 0, Start, Amount, S7Consts.S7WLTimer, sBuffer); return WriteArea(S7Area.TM, 0, Start, Amount, S7WordLength.Timer, sBuffer);
} }
public int CTRead(int Start, int Amount, ushort[] Buffer) public int CTRead(int Start, int Amount, ushort[] Buffer)
{ {
byte[] sBuffer = new byte[Amount * 2]; byte[] sBuffer = new byte[Amount * 2];
int Result = ReadArea(S7Consts.S7AreaCT, 0, Start, Amount, S7Consts.S7WLCounter, sBuffer); int Result = ReadArea(S7Area.CT, 0, Start, Amount, S7WordLength.Counter, sBuffer);
if (Result==0) if (Result==0)
{ {
for (int c=0; c<Amount; c++) for (int c=0; c<Amount; c++)
@@ -1399,7 +1399,7 @@ namespace Sharp7
sBuffer[c * 2 + 1] = (byte)((Buffer[c] & 0xFF00)>>8); sBuffer[c * 2 + 1] = (byte)((Buffer[c] & 0xFF00)>>8);
sBuffer[c * 2]= (byte)(Buffer[c] & 0x00FF); sBuffer[c * 2]= (byte)(Buffer[c] & 0x00FF);
} }
return WriteArea(S7Consts.S7AreaCT, 0, Start, Amount, S7Consts.S7WLCounter, sBuffer); return WriteArea(S7Area.CT, 0, Start, Amount, S7WordLength.Counter, sBuffer);
} }
#endregion #endregion