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

scrips: removal of adc-related folder and renamed pts_log folder to masterfip_log

test05: changed ipmi info to masterFIP V4 (was masterFIP V3)
scrips: removal of adc-related folder and renamed pts_log folder to masterfip_log
cb3876d6 · Evangelia Gousiou · b780958f · cb3876d6 · cb3876d6 · cb3876d6
Commit cb3876d6 authored Jan 31, 2018 by Evangelia Gousiou
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 9 deletions

install.sh install.sh +6 -5

fmcmasterfip.sh pts/fmcmasterfip.sh +2 -2

test05.py python/test05.py +2 -2

No files found.
--- a/install.sh
+++ b/install.sh
@@ -89,7 +89,7 @@ echo "Creating desktop shortcut"
 echo -e "[Desktop Entry]
 Type=Application
 Terminal=false
-Name=PTSmasterFIP
+Name=PTS masterFIP
 Exec=terminator --working-directory=${PWD}/pts/ -e \"sudo -u root ${PWD}/pts/fmcmasterfip.sh ; bash\"
 Icon=${PWD}/doc/icon.png
 Comment=
@@ -98,9 +98,10 @@ StartupNotify=false
 " > ~/Desktop/test_fmcmasterfip.desktop

 # copy read_samples.py to logdir
-LOGDIR="${HOME}/Desktop/pts_log/fmcmasterfip"
-mkdir -p "$LOGDIR/adcdata"
-cp "python/read_samples.py" "$LOGDIR/adcdata"
+LOGDIR="${HOME}/Desktop/masterFIP_log/fmcmasterfip"
+
+mkdir -p "$LOGDIR" # /adcdata" #no adc on this version
+#cp "python/read_samples.py" "$LOGDIR/adcdata"

 # create desktop shortcut
 chmod +x ~/Desktop/test_fmcmasterfip.desktop
--- a/pts/fmcmasterfip.sh
+++ b/pts/fmcmasterfip.sh
@@ -16,7 +16,7 @@ fi

 topdirname="fmcmasterfip"
 projectpath="."
-LOGDIR="${HOME}/Desktop/pts_log/fmcmasterfip"
+LOGDIR="${HOME}/Desktop/masterFIP_log/fmcmasterfip"

 #######################################################################
 ############# Getting absolute path for project #######################
@@ -96,7 +96,7 @@ insmod "${top}/${projectpath}/software/cp210x/cp210x.ko"
 # create log directories
 mkdir -p "$LOGDIR"
 mkdir -p "$LOGDIR/eeprom"
-mkdir -p "$LOGDIR/adcdata"
+#mkdir -p "$LOGDIR/adcdata"


 # get board serial

--- a/python/test05.py
+++ b/python/test05.py
@@ -129,7 +129,7 @@ def main (card=None, default_directory='.',suite=None, serial=None):
    
    ipmi_vendor = "CERN"
    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("Name: %s" % ipmi_name )