Jonny007-MKD/Bachelorthesis
1
0
Fork 0
Code Pull requests Releases Activity
69 commits 1 branch 0 tags 2.4 MiB
Commit graph

69 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jonny007-MKD
6ddb12d98f Changed B&R receive window to 8 2014-07-14 10:32:08 +00:00
Jonny007-MKD
c851e7832a Added configuration that runs some tests with the stack 2014-07-14 10:27:37 +00:00
Jonny007-MKD
2d26d89db0 Implemented checks in ModbusWriteRegisters so that the upper bound of process image is not exceeded. 2014-07-14 10:27:04 +00:00
Jonny007-MKD
608ec48e47 Implemented checks in ModbusWriteBits that the upper bound of process image is not exceeded. 2014-07-14 10:20:47 +00:00
Jonny007-MKD
752f282c3a Added defaults to switch statements 2014-07-14 09:37:21 +00:00
Jonny007-MKD
723a6bacc7 Included and adjusted the Panel from Airbus (DEU Power) 2014-07-11 11:34:18 +00:00
Jonny007-MKD
84ab39d5b3 ModbusClient.cin 
Counting the send attempts to reject packets that cannot be send (e.g. wrong network)

MakeConfig.can
  Introduced options (skip255 and useThirdIpNameForNodeName)
 2014-07-11 11:32:02 +00:00
Jonny007-MKD
caf58bd7d6 ModbusClient.cin 
Improved _ModbusReadBits and _ModbusReadRegisters: Check address and curCount against device information
 2014-07-10 07:58:18 +00:00
Jonny007-MKD
3e3a24a2a3 DeviceInformation.cin 
Improved device structure
 2014-07-10 07:56:55 +00:00
Jonny007-MKD
decc7357e7 DeviceInformation.cin 
Moved device information into structure
PollingModbusClient.can
  Use device structure
ModbusClient.cin
  Use device structure and enum ModbusFuncCode

ModbusEil.cin
ModbusTcp.cin
  Fixes
 2014-07-08 11:38:32 +00:00
Jonny007-MKD
7b08b19840 Minor changes 2014-07-07 10:24:11 +00:00
Jonny007-MKD
2df8f31eb7 Moved all sysvars to PollingModbusClient.can 
Fixed bug when splitting Modbus write requests
 2014-07-04 11:29:18 +00:00
Jonny007-MKD
b6f211d5d3 Prefixed "private" functions with underscore 2014-07-04 10:59:58 +00:00
Jonny007-MKD
bf03b46d34 Improve comments 2014-07-04 09:57:03 +00:00
Jonny007-MKD
1e893112dd Airbus Panels 2014-06-20 10:46:06 +00:00
Jonny007-MKD
32c009aa98 Added comments 
Refactured Layer 4
 2014-06-20 10:45:41 +00:00
Jonny007-MKD
8c7dae6169 Added mapping stuff 2014-06-17 18:23:42 +00:00
Jonny007-MKD
409f2327c6 2014-06-17 16:41:05 +00:00
Jonny007-MKD
2279ff04b0 DeviceInformation.cin 
Added default value of 1 to gDevReceiveWindow because gtRobin would do anything in MakeConfig
 2014-06-17 14:28:29 +00:00
Jonny007-MKD
93dd56469d ModbusClientCommon.cin 
Introduced loops to automatically split requests that are too large for Modbus

ModbusClient.can
  Modified Modbus events so that the split requests (see above) will be written at the correct position in sys vars

ModbusFunctions.cin
DeviceInformation.cin
  Introduced new file that will handle most device specific things

ModbusStructs.cin
  Introduced new constants with maximum Modbus values

MakeConfig.can
  Increment IP address with swapDWord
  Moved detection stuff to DeviceInformation.cin
 2014-06-17 14:21:45 +00:00
Jonny007-MKD
9dc7ffd47d ModbusClient.can 
MakeConfig.can
  Added 
ModbusClientCommon.cin
  Introduced different functions for ModbusFuncCode 0x01 and 0x02. B&R handles them differently
 2014-06-16 12:50:35 +00:00
Jonny007-MKD
c93d7d22f2 2014-06-16 09:30:54 +00:00
Jonny007-MKD
7716a32185 Notify with MbInfo of received data 2014-06-16 07:24:08 +00:00
Jonny007-MKD
4e40928ff9 2014-06-16 07:23:21 +00:00
Jonny007-MKD
f04e31f35e Use values from 0x1022..0x1025 to get the number of IOs 2014-06-12 17:01:37 +00:00
Jonny007-MKD
57ea11238f Comments in MakeConfig.can 2014-06-12 15:28:05 +00:00
Jonny007-MKD
23e0b8af56 EilDLL enhancements 2014-06-12 07:23:50 +00:00
Jonny007-MKD
13c03dd807 ModbusClientCommon.cin 
Changed timer to support EilDll

ModbusStructs.cin
  Removed header from all structs

ModbusProtocol.cpp
  Fixed data length issue (l. 353)
  More precise info in InspectProtocol()
  New getter: GetAddrNCount()
 2014-06-02 12:16:23 +00:00
Jonny007-MKD
95304c9216 ParsePacket() works 2014-05-30 15:14:33 +00:00
Jonny007-MKD
010e10f567 2014-05-28 14:37:39 +00:00
Jonny007-MKD
7dd0860785 Renamed folder VCSignalProtocolDLL to ModbusProtocolDLL 2014-05-28 14:34:53 +00:00
Jonny007-MKD
c6fece1602 Finally the SLN 2014-05-28 14:32:07 +00:00
Jonny007-MKD
b0c465c341 Changed VCSignalProtocol to ModbusProtocol 
This is a first draft and it would be lucky if it worked
 2014-05-28 14:27:53 +00:00
Jonny007-MKD
cdd7f1352a Upgraded to VisualStudio 2010 2014-05-28 09:27:33 +00:00
Jonny007-MKD
f26088b1eb Copied Modbus-CAPL and added VisualStudio project VCSignalProtocolDLL 2014-05-28 09:20:38 +00:00
Jonny007-MKD
41ba4a3fd5 Renamed project Modbus to Modbus-CAPL 2014-05-27 12:32:27 +00:00
Jonny007-MKD
f88f9ec9d5 Renamed ModbusCommonStructs.cin to ModbusStructs.cin 2014-05-27 12:30:01 +00:00
Jonny007-MKD
7fc38537b3 MakeConfig.can 
Added OnModbusClientPanics()
  better output

Common.cin
  Changed output sink to CAPL
 2014-05-27 11:29:24 +00:00
Jonny007-MKD
3d9c1cca10 Merging branch writeDbg into trunk 2014-05-27 11:03:56 +00:00
Jonny007-MKD
c06227db68 Merged branch EthernetIL back into trunk 2014-05-27 08:27:56 +00:00
Jonny007-MKD
9d0c136b08 include/CAPL/MakeConfig.can 
Generate Config in SysVars using Config in MakeConfig
  Added Vendor
 2014-05-26 11:58:28 +00:00
Jonny007-MKD
bd545bd232 Moved files to new locations 2014-05-26 10:22:46 +00:00
Jonny007-MKD
e0a6d84a9f include/ModbusFunctions.cin 
Write values to struct

MakeConfig.can
  Detect devices via IP port scan
  Analyze devices and generate sysVars appropriately

ModbusClientUDP.can
  Don't analyze devices because this has to be done in MakeConfig.can
 2014-05-26 10:07:04 +00:00
Jonny007-MKD
bcf79a7b27 Modbus/include/ModbusClientCommon.cin 
Fix error in Exception handling

Fix other issues
 2014-05-21 11:38:59 +00:00
Jonny007-MKD
087453d5c3 New project: MakeConfig 
This project can generate SysVar definitions and CANdbs depending on IP addresses
 2014-05-21 11:37:57 +00:00
Jonny007-MKD
df4813e33d Modbus/include/ModbusClientCommon.cin 
fixed decoding bits in OnModbusReceiveBits()

Modbus/ModbusClientUDP.can
  Enhanced client
    Timer that automatically refreshes the status
    Save received data in sysvars
 2014-05-21 11:29:29 +00:00
Jonny007-MKD
dde6cef26f Modbus/include/ModbusClientCommon.cin 
Removed the 9 seperate times
  Introduced pending, sent and ack stacks to allow concurrent requests
  Introduced timer gtRobin that monitors the stacks, sends the packets and checks for timeouts

Modbus/include/ModbusCommonStructs.cin
  added enum ModbusFuncCode

Modbus/include/ModbusFunctions.cin
  fixed analog modules

Modbus/include/TcpCommon.cin
  don't use local ip anymore

Modbus/ModbusClientUDP.can
  no state machine for reading configuration :)
 2014-05-21 11:26:45 +00:00
Jonny007-MKD
73e18085c3 Modbus/include/ModbusCommonStructs.cin 
aligned structs

Modbus/include/UdpCommon.cin
  testing EthGetAdapterStatus before opening sockets
  don't use local ip for socket anymore
 2014-05-21 10:55:57 +00:00
Jonny007-MKD
c43e3cef40 Modbus/include/ModbusCommonStructs.cin 
aligned structs

Modbus/modbus.dbc
  Included Ethernet_IL.dll
 2014-05-21 10:53:02 +00:00
Jonny007-MKD
2ed521dc48 Detect connected modules and count inputs and outputs 2014-05-15 16:40:08 +00:00