Merge branch 'master' of jspc29:daqtools

diff --cc base/startup_example.sh
index 517128807d371ad5b25cc40912b77635d65b2495,a1c7b333bfca1a635d34a0460113d98a3c4e6cb1..5651315eb25d0295459aaa056de899ebb135d919
--- 1/base/startup_example.sh
--- 2/base/startup_example.sh
+++ b/base/startup_example.sh
@@@ -5,21 -5,24 +5,24 @@@
  
  ##### TRBNET #####
  # set the TRBNet addresses of the Endpoints
- trbcmd s 0xb000000390381d28 0 0x0200
- trbcmd s 0xa300000390381328 1 0x0201
- trbcmd s 0x4800000390381628 2 0x0202
- trbcmd s 0x1700000390382028 3 0x0203
- trbcmd s 0xdc00000390380c28 5 0x8000
+ #trbcmd s 0xb000000390381d28 0 0x0200
+ #trbcmd s 0xa300000390381328 1 0x0201
+ #trbcmd s 0x4800000390381628 2 0x0202
+ #trbcmd s 0x1700000390382028 3 0x0203
+ #trbcmd s 0xdc00000390380c28 5 0x8000
+ 
+ # automatic setup of all trbnet addresses
+ ~/daqtools/merge_serial_address.pl ~/daqtools/base/serials_trb3.db ~/daqtools/base/addresses_trb3.db > /dev/null
  
  ##### Ethernet and UDP #######
 -trbcmd w 0x8000 0x8300 0x8000
 +trbcmd w 0x8000 0x8300 0x8000        #Subsystem ID in data files, should be equal to address
  trbcmd w 0x8000 0x8301 0x00020001
  trbcmd w 0x8000 0x8302 0x00030062
 -trbcmd w 0x8000 0x8303 0xea60
 -trbcmd w 0x8000 0x8304 0x2260
 -trbcmd w 0x8000 0x8305 0x1
 +trbcmd w 0x8000 0x8303 0xea60        #Maximum UDP packet size (<62 kB!)
 +trbcmd w 0x8000 0x8304 0x2260        #Maximum Ethernet frame size
 +trbcmd w 0x8000 0x8305 0x1           #Enable GbE
  trbcmd w 0x8000 0x8306 0x0
 -trbcmd w 0x8000 0x8307 0x0
 +trbcmd w 0x8000 0x8307 0x0           #Pack multiple events in one packet to reduce overhead
  trbcmd w 0x8000 0x8308 0xffffff
  trbcmd w 0x8000 0x830b 0x7
  trbcmd w 0x8000 0x830d 0x0