linse/frappy
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix doc and REAMDE

Browse Source 
Change-Id: I2e022e29e52511ca1a7f529d6d1bae44a995a073
This commit is contained in:
zolliker 2021-03-01 14:31:02 +01:00
parent f861701fc2
commit d3831b3974
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -3,6 +3,8 @@
current running code at SINQ, with newest changes not yet pushed current running code at SINQ, with newest changes not yet pushed
through the Gerrit workflow at MLZ through the Gerrit workflow at MLZ
## Branches
branches: branches:
- mlz: master from forge.frm2.tum.de:29418/sine2020/secop/playground - mlz: master from forge.frm2.tum.de:29418/sine2020/secop/playground
@ -39,3 +41,17 @@ changes are done, eventually a sync step should happen:
6) in wip: cherry-pick commits not yet feeded into Gerrit from copy in step (1) 6) in wip: cherry-pick commits not yet feeded into Gerrit from copy in step (1)
7) decide from where to take new work branch (probably from wip) 7) decide from where to take new work branch (probably from wip)
8) delete branch copies not needed any more 8) delete branch copies not needed any more
## Procedure to update PPMS
1) git checkout wip (or work, whatever state to copy to ppms)
2) git checkout -B ppms # local branch ?
3) assume PPMSData is mounted on /Volumes/PPMSData
cp -r secop_psi /Volumes/PPMSData/zolliker/frappy/secop_psi
cp -r secop /Volumes/PPMSData/zolliker/frappy/secop
it may be that additional folder have to copied ...

2
doc/source/index.rst
View File

@ -5,7 +5,7 @@ Frappy Programming Guide
:maxdepth: 2 :maxdepth: 2
introduction introduction
tutorial tutorial_helevel
reference reference
secop_psi secop_psi
secop_demo secop_demo