Jonny007-MKD/Bachelorthesis
1
0
Fork 0
Code Pull requests Releases Activity

Modbus/include/ModbusCommonStructs.cin

Browse source 
aligned structs

Modbus/modbus.dbc
  Included Ethernet_IL.dll
This commit is contained in:
Jonny007-MKD 2014-05-21 10:53:02 +00:00
parent 2ed521dc48
commit c43e3cef40
6 changed files with 37 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Modbus/include/Common.cin
View file

@ -2,7 +2,7 @@
void bin_to_strhex(byte bin[], char result[]) void bin_to_strhex(byte bin[], char result[])
{ {
char hex_str[17] = "0123456789ABCDEF"; char hex_str[17]= "0123456789ABCDEF";
word i; word i;
word binsz; word binsz;
@ -28,7 +28,7 @@ void bin_to_strhex(byte bin[], char result[])
void hbin_to_strhex(byte bin[], char result[]) void hbin_to_strhex(byte bin[], char result[])
{ {
char hex_str[17] = "0123456789ABCDEF"; char hex_str[17]= "0123456789ABCDEF";
word i; word i;
word binsz; word binsz;
@ -49,33 +49,4 @@ void hbin_to_strhex(byte bin[], char result[])
result[38] = '.'; result[38] = '.';
} }
result[binsz * 2 - 1] = 0; result[binsz * 2 - 1] = 0;
}
void dbin_to_strhex(word bin[], char result[])
{
char hex_str[17] = "0123456789ABCDEF";
word i;
word binsz;
byte offset;
binsz = elCount(bin);
if (binsz > 20)
binsz = 20;
for (i = 0; i < binsz; i++)
{
result[i * 5 + 0] = hex_str[(bin[i] >> 12) & 0x0F];
result[i * 5 + 1] = hex_str[(bin[i] >> 8) & 0x0F];
result[i * 5 + 2] = hex_str[(bin[i] >> 4) & 0x0F];
result[i * 5 + 3] = hex_str[(bin[i] ) & 0x0F];
result[i * 5 + 4] = ' ';
}
if (elCount(bin) > 20) // trailing "..."
{
result[96] = '.';
result[97] = '.';
result[98] = '.';
}
result[(byte)(binsz * 2.5) - 1] = 0;
} }

70
Modbus/include/ModbusCommonStructs.cin
View file

@ -2,7 +2,7 @@
variables variables
{ {
// A normal Modbus Application Header. Every Modbus Packet begins with these 7 (+FuncCode) Bytes // A normal Modbus Application Header. Every Modbus Packet begins with these 7 (+FuncCode) Bytes
_align(1) struct ModbusApHeader struct ModbusApHeader
{ {
word TxID; word TxID;
word Protocol; word Protocol;
@ -11,21 +11,21 @@ variables
byte FuncCode; byte FuncCode;
}; };
// Read Data from the host. We only need the start address and the number of bits/registers we want to read // Read Data from the host. We only need the start address and the number of bits/registers we want to read
_align(1) struct ModbusReqRead struct ModbusReqRead
{ {
struct ModbusApHeader Header; struct ModbusApHeader Header;
word Address; word Address;
word Count; word Count;
}; };
// Write a single value to a bit/register // Write a single value to a bit/register
_align(1) struct ModbusReqWriteSingle struct ModbusReqWriteSingle
{ {
struct ModbusApHeader Header; struct ModbusApHeader Header;
word Address; word Address;
word Value; word Value;
}; };
// Write several values to a bit/register starting with Address // Write several values to a bit/register starting with Address
_align(1) struct ModbusReqWriteBits struct ModbusReqWriteBits
{ {
struct ModbusApHeader Header; struct ModbusApHeader Header;
word Address; word Address;
@ -34,89 +34,41 @@ variables
byte Data[246]; // Max length: 1968 bits byte Data[246]; // Max length: 1968 bits
}; };
// Write several values to bits starting with Address // Write several values to bits starting with Address
_align(1) struct ModbusReqWriteRegisters struct ModbusReqWriteRegisters
{ {
struct ModbusApHeader Header; struct ModbusApHeader Header;
word Address; word Address;
word Count; word Count;
byte ByteCount; byte ByteCount;
word Data[123]; // Max length: 123 registers int Data[123]; // Max length: 123 registers
}; };
// Write AND and OR masks to a holding register
_align(1) struct ModbusReqWriteMasks
{
struct ModbusApHeader Header;
word Address;
word And;
word Or;
};
// Read and write multiple registers
_align(1) struct ModbusReqReadWriteRegisters
{
struct ModbusApHeader Header;
word ReadAddress;
word ReadCount;
word WriteAddress;
word WriteCount;
byte ByteCount;
word Data[121]; // Max length: 123-2 registers
};
// Receive several bit values // Receive several bit values
_align(1) struct ModbusResReceiveBits struct ModbusResReceiveBits
{ {
struct ModbusApHeader Header; struct ModbusApHeader Header;
byte ByteCount; byte ByteCount;
byte Data[250]; // Max length: 2000 bits byte Data[250]; // Max length: 2000 bits
}; };
// Receive several register values // Receive several register values
_align(1) struct ModbusResReceiveRegisters struct ModbusResReceiveRegisters
{ {
struct ModbusApHeader Header; struct ModbusApHeader Header;
byte ByteCount; byte ByteCount;
word Data[125]; // Max length: 125 registers int Data[125]; // Max length: 125 registers
}; };
// Confirm the write of a single bit/register // Confirm the write of a single bit/register
_align(1) struct ModbusResConfirmSingle struct ModbusResConfirmSingle
{ {
struct ModbusApHeader Header; struct ModbusApHeader Header;
word Address; word Address;
int Value; int Value;
}; };
// Confirm the write of several bits/registers // Confirm the write of several bits/registers
_align(1) struct ModbusResConfirmMultiple struct ModbusResConfirmMultiple
{ {
struct ModbusApHeader Header; struct ModbusApHeader Header;
word Address; word Address;
word Count; word Count;
}; };
// Confirm the write of AND and OR mask
_align(1) struct ModbusResConfirmMasks
{
struct ModbusApHeader Header;
word Address;
word And;
word Or;
};
enum ModbusRequestError
{
Exception,
Timeout
};
enum ModbusException
{
None = 0x00,
IllegalFuncCode = 0x01,
IllegalDataAddress = 0x02,
IllegalDataValue = 0x03,
ServerFailure = 0x04,
Acknowledge = 0x05,
ServerBusy = 0x06,
GatewayPathsNA = 0x0A,
TargetOffline = 0x0B
};
} }

2
Modbus/include/TcpUdpCommon.cin
View file

@ -29,7 +29,7 @@ dword SetupIp(char Local_IP[])
long error; long error;
adapterCount = IpGetAdapterCount(); adapterCount = IpGetAdapterCount();
adapterIndex = @sysvar::Config::TcpIp::AdapterIndex; adapterIndex = @sysvar::TCPIP::AdapterIndex;
switch (adapterCount) switch (adapterCount)
{ {

2
Modbus/modbus.cfg
View file

@ -4982,7 +4982,7 @@ VSimulinkModelViewerConfiguration 7 Begin_Of_Object
End_Of_Object VSimulinkModelViewerConfiguration 7 End_Of_Object VSimulinkModelViewerConfiguration 7
1 1
0 0
2556482575 3696050849
0 0
NodeSignalPanelBustypeCount 0 NodeSignalPanelBustypeCount 0
End_Of_Object VSimulationNode 6 End_Of_Object VSimulationNode 6

2
Modbus/modbus.dbc
View file

@ -40,8 +40,10 @@ BU_: Wago_3
EV_ Wago_3_IP: 0 [0|0] "" 0 1 DUMMY_NODE_VECTOR8001 Vector__XXX; EV_ Wago_3_IP: 0 [0|0] "" 0 1 DUMMY_NODE_VECTOR8001 Vector__XXX;
BA_DEF_ BU_ "NodeLayerModules" STRING ;
BA_DEF_ "DBName" STRING ; BA_DEF_ "DBName" STRING ;
BA_DEF_ "BusType" STRING ; BA_DEF_ "BusType" STRING ;
BA_DEF_DEF_ "NodeLayerModules" "Ethernet_IL.DLL";
BA_DEF_DEF_ "DBName" ""; BA_DEF_DEF_ "DBName" "";
BA_DEF_DEF_ "BusType" "Ethernet"; BA_DEF_DEF_ "BusType" "Ethernet";
BA_ "BusType" "Ethernet"; BA_ "BusType" "Ethernet";

40
Modbus/modbus.ini
View file

@ -11,13 +11,13 @@ COLUMNWIDTHS=125,125,
[View_VehicleNetworks] [View_VehicleNetworks]
HIDDEN=3,5, HIDDEN=3,5,
ORDER=0,1,2,3,4, ORDER=0,1,2,3,4,
DEFINITIONS=1,2, DEFINITIONS=2,3,
COLUMNWIDTHS=125,125,100,100,150,100,100, COLUMNWIDTHS=125,125,100,100,150,100,100,
[View_VehicleNetwork] [View_VehicleNetwork]
HIDDEN= HIDDEN=
ORDER=0,1,2,3,4, ORDER=0,1,2,3,4,5,
DEFINITIONS= DEFINITIONS=1,
COLUMNWIDTHS=125,125,100,125,150, COLUMNWIDTHS=125,125,100,125,150,100,
[View_VehicleNetworkTxMessages] [View_VehicleNetworkTxMessages]
HIDDEN= HIDDEN=
ORDER=0,1,2,3,4,5,6,7,8, ORDER=0,1,2,3,4,5,6,7,8,
@ -30,9 +30,9 @@ DEFINITIONS=
COLUMNWIDTHS=125,125,100,50,100,50,100,100,100,50,50,50,50,100,100,150, COLUMNWIDTHS=125,125,100,50,100,50,100,100,100,50,50,50,50,100,100,150,
[View_VehicleControlUnit] [View_VehicleControlUnit]
HIDDEN= HIDDEN=
ORDER=0,1,2,3,4, ORDER=0,1,2,3,4,5,
DEFINITIONS= DEFINITIONS=1,
COLUMNWIDTHS=125,125,100,125,150, COLUMNWIDTHS=125,125,100,125,150,100,
[View_VehicleGateways] [View_VehicleGateways]
HIDDEN= HIDDEN=
ORDER=0,1,2, ORDER=0,1,2,
@ -46,13 +46,13 @@ COLUMNWIDTHS=125,125,125,125,125,125,125,
[View_Networks] [View_Networks]
HIDDEN=2,4, HIDDEN=2,4,
ORDER=0,1,2,3, ORDER=0,1,2,3,
DEFINITIONS=1,2, DEFINITIONS=2,3,
COLUMNWIDTHS=125,100,100,150,100,100, COLUMNWIDTHS=125,100,100,150,100,100,
[View_Network] [View_Network]
HIDDEN= HIDDEN=
ORDER=0,1,2,3, ORDER=0,1,2,3,4,
DEFINITIONS= DEFINITIONS=1,
COLUMNWIDTHS=125,125,100,150, COLUMNWIDTHS=125,125,100,150,100,
[View_NetworkTxMessages] [View_NetworkTxMessages]
HIDDEN= HIDDEN=
ORDER=0,1,2,3,4,5,6,7,8, ORDER=0,1,2,3,4,5,6,7,8,
@ -65,9 +65,9 @@ DEFINITIONS=
COLUMNWIDTHS=125,125,100,50,100,50,100,100,100,50,50,50,50,100,100,150, COLUMNWIDTHS=125,125,100,50,100,50,100,100,100,50,50,50,50,100,100,150,
[View_NetworkNodeGroup] [View_NetworkNodeGroup]
HIDDEN= HIDDEN=
ORDER=0,1,2, ORDER=0,1,2,3,
DEFINITIONS= DEFINITIONS=1,
COLUMNWIDTHS=125,100,150, COLUMNWIDTHS=125,100,150,100,
[View_Ecus] [View_Ecus]
HIDDEN= HIDDEN=
ORDER=0,1, ORDER=0,1,
@ -75,9 +75,9 @@ DEFINITIONS=
COLUMNWIDTHS=125,150, COLUMNWIDTHS=125,150,
[View_Ecu] [View_Ecu]
HIDDEN= HIDDEN=
ORDER=0,1,2,3, ORDER=0,1,2,3,4,
DEFINITIONS= DEFINITIONS=1,
COLUMNWIDTHS=125,125,100,150, COLUMNWIDTHS=125,125,100,150,100,
[View_EnvVars] [View_EnvVars]
HIDDEN= HIDDEN=
ORDER=0,1,2,3,4,5,6,7,8,9, ORDER=0,1,2,3,4,5,6,7,8,9,
@ -100,9 +100,9 @@ DEFINITIONS=
COLUMNWIDTHS=125,125,55,150, COLUMNWIDTHS=125,125,55,150,
[View_Nodes] [View_Nodes]
HIDDEN= HIDDEN=
ORDER=0,1,2, ORDER=0,1,2,3,
DEFINITIONS= DEFINITIONS=1,
COLUMNWIDTHS=125,100,150, COLUMNWIDTHS=125,100,150,100,
[View_Node] [View_Node]
HIDDEN= HIDDEN=
ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14, ORDER=0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,