Commit cb3876d6 authored by Evangelia Gousiou's avatar Evangelia Gousiou

test05: changed ipmi info to masterFIP V4 (was masterFIP V3)

scrips: removal of adc-related folder and renamed pts_log folder to masterfip_log
parent b780958f
...@@ -89,7 +89,7 @@ echo "Creating desktop shortcut" ...@@ -89,7 +89,7 @@ echo "Creating desktop shortcut"
echo -e "[Desktop Entry] echo -e "[Desktop Entry]
Type=Application Type=Application
Terminal=false Terminal=false
Name=PTSmasterFIP Name=PTS masterFIP
Exec=terminator --working-directory=${PWD}/pts/ -e \"sudo -u root ${PWD}/pts/fmcmasterfip.sh ; bash\" Exec=terminator --working-directory=${PWD}/pts/ -e \"sudo -u root ${PWD}/pts/fmcmasterfip.sh ; bash\"
Icon=${PWD}/doc/icon.png Icon=${PWD}/doc/icon.png
Comment= Comment=
...@@ -98,9 +98,10 @@ StartupNotify=false ...@@ -98,9 +98,10 @@ StartupNotify=false
" > ~/Desktop/test_fmcmasterfip.desktop " > ~/Desktop/test_fmcmasterfip.desktop
# copy read_samples.py to logdir # copy read_samples.py to logdir
LOGDIR="${HOME}/Desktop/pts_log/fmcmasterfip" LOGDIR="${HOME}/Desktop/masterFIP_log/fmcmasterfip"
mkdir -p "$LOGDIR/adcdata"
cp "python/read_samples.py" "$LOGDIR/adcdata" mkdir -p "$LOGDIR" # /adcdata" #no adc on this version
#cp "python/read_samples.py" "$LOGDIR/adcdata"
# create desktop shortcut # create desktop shortcut
chmod +x ~/Desktop/test_fmcmasterfip.desktop chmod +x ~/Desktop/test_fmcmasterfip.desktop
\ No newline at end of file
...@@ -16,7 +16,7 @@ fi ...@@ -16,7 +16,7 @@ fi
topdirname="fmcmasterfip" topdirname="fmcmasterfip"
projectpath="." projectpath="."
LOGDIR="${HOME}/Desktop/pts_log/fmcmasterfip" LOGDIR="${HOME}/Desktop/masterFIP_log/fmcmasterfip"
####################################################################### #######################################################################
############# Getting absolute path for project ####################### ############# Getting absolute path for project #######################
...@@ -96,7 +96,7 @@ insmod "${top}/${projectpath}/software/cp210x/cp210x.ko" ...@@ -96,7 +96,7 @@ insmod "${top}/${projectpath}/software/cp210x/cp210x.ko"
# create log directories # create log directories
mkdir -p "$LOGDIR" mkdir -p "$LOGDIR"
mkdir -p "$LOGDIR/eeprom" mkdir -p "$LOGDIR/eeprom"
mkdir -p "$LOGDIR/adcdata" #mkdir -p "$LOGDIR/adcdata"
# get board serial # get board serial
......
...@@ -129,7 +129,7 @@ def main (card=None, default_directory='.',suite=None, serial=None): ...@@ -129,7 +129,7 @@ def main (card=None, default_directory='.',suite=None, serial=None):
ipmi_vendor = "CERN" ipmi_vendor = "CERN"
ipmi_name = "fmc-masterfip" ipmi_name = "fmc-masterfip"
ipmi_part = "EDA-03098-V3-%d" % speed ipmi_part = "EDA-03098-V4-%d" % speed
util.info_msg("Vendor: %s" % ipmi_vendor ) util.info_msg("Vendor: %s" % ipmi_vendor )
util.info_msg("Name: %s" % ipmi_name ) util.info_msg("Name: %s" % ipmi_name )
...@@ -186,4 +186,4 @@ def main (card=None, default_directory='.',suite=None, serial=None): ...@@ -186,4 +186,4 @@ def main (card=None, default_directory='.',suite=None, serial=None):
if __name__ == '__main__' : if __name__ == '__main__' :
main() main()
\ No newline at end of file
...@@ -56,7 +56,7 @@ fi ...@@ -56,7 +56,7 @@ fi
echo "Identified $top as FMC masterFip top directory" echo "Identified $top as FMC masterFip top directory"
insmod "${top}/${projectpath}/software/fmc-bus/kernel/fmc.ko" insmod "${top}/${projectpath}/software/fmc-bus/kernel/fmc.ko"
insmod "${top}/${projectpath}/software/spec-sw/kernel/spec.ko" "fw_name=../../${top}/${projectpath}/gateware/spec-init.bin-2012-12-14" insmod "${top}/${projectpath}/software/spec-sw/kernel/spec.ko" "fw_name=../../${top}/${projectpath}/gateware/spec-init.bin-2012-12-14"
# insmod "${top}/${projectpath}/software/zio/zio.ko" # insmod "${top}/${projectpath}/software/zio/zio.ko"
# insmod "${top}/${projectpath}/software/fmc-adc-100m14b4cha-sw/kernel/fmc-adc-100m14b.ko" "gateware=../../${top}/${projectpath}/gateware/syn/spec/spec_top_fmc_masterfip.bin" # insmod "${top}/${projectpath}/software/fmc-adc-100m14b4cha-sw/kernel/fmc-adc-100m14b.ko" "gateware=../../${top}/${projectpath}/gateware/syn/spec/spec_top_fmc_masterfip.bin"
......
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