sf-mx/PBSwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

major code restructure and cleanup

Browse Source
This commit is contained in:
zamofing_t
2019-01-23 12:08:47 +00:00
parent 66e2d038ba
commit dab7fb940c
12 changed files with 454 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
python/usr_code/Makefile
View File

@@ -20,7 +20,7 @@
#------------------------------------------------------------------------------
PPMAC=SAR-CPPM-EXPMX1
PPMAC=MOTTEST-CPPM-CRM0573
#PPMAC=MOTTEST-CPPM-CRM0573
#PPMAC=SAROP11-CPPM-MOT6871
PMAC_ARCH=ppc465-2
@@ -106,16 +106,35 @@ tags:
find $(RTPMACINCLUDEDIR) -type f -iname "*.[chS]" | xargs ctags -a -f .tags
Debug: all
Debug: all
install: all
scp usralgo.ko root@$(PPMAC):/tmp
scp /home/zamofing_t/Documents/prj/SwissFEL/PBTools/pbtools/usr_servo_phase/userservo_util root@$(PPMAC):/tmp
-ssh root@$(PPMAC) LD_LIBRARY_PATH=/opt/ppmac/libppmac/ /tmp/userservo_util -d 9
-ssh root@$(PPMAC) LD_LIBRARY_PATH=/opt/ppmac/libppmac/ /tmp/userservo_util -d 1
-ssh root@$(PPMAC) LD_LIBRARY_PATH=/opt/ppmac/libppmac/ /tmp/userservo_util -d 2
-ssh root@$(PPMAC) rmmod usralgo
-ssh root@$(PPMAC) insmod /tmp/usralgo.ko
-ssh root@$(PPMAC) LD_LIBRARY_PATH=/opt/ppmac/libppmac/ /tmp/userservo_util -l 0 usr_servo_evr_tigger
-ssh root@$(PPMAC) LD_LIBRARY_PATH=/opt/ppmac/libppmac/ /tmp/userservo_util -e 9
gpasciiCommander --host $(PPMAC) -c 'Motor[1].Ctrl=Sys.ServoCtrl;Motor[2].Ctrl=Sys.ServoCtrl'
-ssh root@$(PPMAC) LD_LIBRARY_PATH=/opt/ppmac/libppmac/ /tmp/userservo_util -l 1 obsvr_servo_ctrl_1
-ssh root@$(PPMAC) LD_LIBRARY_PATH=/opt/ppmac/libppmac/ /tmp/userservo_util -l 2 obsvr_servo_ctrl_2
-ssh root@$(PPMAC) LD_LIBRARY_PATH=/opt/ppmac/libppmac/ /tmp/userservo_util -e 1
-ssh root@$(PPMAC) LD_LIBRARY_PATH=/opt/ppmac/libppmac/ /tmp/userservo_util -e 2
gpasciiCommander --host $(PPMAC) -c 'Motor[1].Ctrl=UserAlgo.ServoCtrlAddr[1];Motor[2].Ctrl=UserAlgo.ServoCtrlAddr[2]'
#Motor[1].Ctrl
#UserAlgo.ServoCtrlAddr[1]
#Motor[1].Ctrl=Sys.PidCtrl
#Motor[1].Ctrl=UserAlgo.ServoCtrlAddr[1]
#Motor[2].Ctrl=Sys.ServoCtrl
#Motor[1].Ctrl=Sys.ServoCtrl
#>>>>>>>> DO THIS TO ACTIVATE SERVO <<<<<<<<<<<
#Motor[1].Ctrl=Sys.ServoCtrl
#Motor[2].Ctrl=Sys.ServoCtrl
#make install
#Motor[1].Ctrl=UserAlgo.ServoCtrlAddr[1]
#Motor[1].Ctrl=UserAlgo.ServoCtrlAddr[2]
#position 0.407 results in ca 0mA output
#!common()
@@ -130,9 +149,9 @@ install: all
#scp pp_proj.ini root@$(PPMAC):/var/ftp/usrflash/Project/Configuration/pp_proj.ini
#scp pp_proj.ini root@$(PPMAC):/tmp/pp_proj.ini
#ssh root@$(PPMAC) projpp
#scp pp_proj.ini root@$(PPMAC):/var/ftp/usrflash/Project/Configuration/pp_proj.ini
#scp pp_proj.ini root@$(PPMAC):/tmp/pp_proj.ini
#ssh root@$(PPMAC) projpp
#MotorData
#MotorData