Skip to content

B
Beam Positoning Monitor - Software
Commit 682f5489 authored by Lucas Russo's avatar Lucas Russo
Browse files
Options

{compile,init}.sh: update scripts due to use of config file

parent 473194ef
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 37 deletions
compile.sh
View file @ 682f5489
...@@ -17,25 +17,10 @@ FMC130M_4CH_EEPROM_PROGRAM= ...@@ -17,25 +17,10 @@ FMC130M_4CH_EEPROM_PROGRAM=
WITH_DEV_MNGR=y WITH_DEV_MNGR=y
# Selects the AFE RFFE version. Options are: 2 # Selects the AFE RFFE version. Options are: 2
AFE_RFFE_TYPE=2 AFE_RFFE_TYPE=2
# Selects the base IP address of all AFE RFFE. The AFE RFFE must be located # Selects the install location of the config file
# starting to the specified IP address up to the number of the AFE RFFE. CFG_FILENAME=/etc/bpm_sw/bpm_sw.cfg
# # Selects the install location of the config file
# Example: CFG_DIR=/etc/bpm_sw
#
# if AFE_BASE_IP_ADDR = 192.168.0.%u and AFE_BASE_IP_OFFSET = 100, the AFE
# RFFE would have the following IP addresses:
#
# AFE RFFE #1 (DBE #1): 192.168.0.100
# AFE RFFE #2 (DBE #1): 192.168.0.101
# AFE RFFE #3 (DBE #2): 192.168.0.102
# AFE RFFE #4 (DBE #2): 192.168.0.103
# AFE RFFE #3 (DBE #3): 192.168.0.104
# AFE RFFE #4 (DBE #3): 192.168.0.105
# ...
AFE_TRANSPORT="tcp"
AFE_BASE_IP_PORT="6791"
AFE_BASE_IP_PATTERN="10.0.18.%u"
AFE_BASE_IP_OFFSET=100
COMMAND="\ COMMAND="\
make BOARD=${BOARD} \ make BOARD=${BOARD} \
...@@ -45,9 +30,7 @@ COMMAND="\ ...@@ -45,9 +30,7 @@ COMMAND="\
FMC130M_4CH_EEPROM_PROGRAM=${FMC130M_4CH_EEPROM_PROGRAM} \ FMC130M_4CH_EEPROM_PROGRAM=${FMC130M_4CH_EEPROM_PROGRAM} \
WITH_DEV_MNGR=${WITH_DEV_MNGR} \ WITH_DEV_MNGR=${WITH_DEV_MNGR} \
AFE_RFFE_TYPE=${AFE_RFFE_TYPE} \ AFE_RFFE_TYPE=${AFE_RFFE_TYPE} \
AFE_TRANSPORT=${AFE_TRANSPORT} \ CFG_DIR=${CFG_DIR} \
AFE_BASE_IP_PATTERN=${AFE_BASE_IP_PATTERN} \
AFE_BASE_IP_OFFSET=${AFE_BASE_IP_OFFSET} \
&& sudo make install" && sudo make install"
echo "Executing: " ${COMMAND} echo "Executing: " ${COMMAND}
......
init.sh
View file @ 682f5489
#!/bin/bash #!/bin/bash
REQUIRED_ARGS=2 REQUIRED_ARGS=0
BIN_DIR=/usr/local/bin BIN_DIR=/usr/local/bin
if [ "$(id -u)" != "0" ] if [ "$(id -u)" != "0" ]
...@@ -12,24 +12,12 @@ fi ...@@ -12,24 +12,12 @@ fi
if [ $# -lt $REQUIRED_ARGS ] if [ $# -lt $REQUIRED_ARGS ]
then then
echo "Error: Wrong arguments!" echo "Error: Wrong arguments!"
echo "Usage: `basename $0` {transport type = [ipc|tcp]} {broker endpoint} [log directory]" echo "Usage: `basename $0`"
exit 1 exit 1
fi fi
transport=$1
broker_endp=$2
log_dir=$3
log_dir_opt=
if [ -z "$log_dir" ]
then
log_dir_opt=
else
log_dir_opt="-l $log_dir"
fi
# Launch Device Manager # Launch Device Manager
${BIN_DIR}/dev_mngr -v -b ${transport}://${broker_endp} ${log_dir_opt} & ${BIN_DIR}/dev_mngr &
# Wait until initial workers have been created # Wait until initial workers have been created
sleep 1 sleep 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment