Skip to content

Gm tree thread #2371

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zack-vii merged 19 commits into from
Aug 26, 2021
Merged

Gm tree thread #2371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
db18ca9
Updates to support library for National Devices
Aug 24, 2021
d12a333
Fix:required changes for trees in threads
Aug 24, 2021
a0831e0
New and updated devices
Aug 24, 2021
1e72277
Update rpm
AndreaRigoni Aug 25, 2021
3ba27b2
Fix wrong nid
Aug 25, 2021
f7e1808
Fix wrong nid
Aug 25, 2021
650fa9e
Python3 compatibility
AndreaRigoni Aug 26, 2021
14cb4d2
Ermove commented
AndreaRigoni Aug 26, 2021
3c613bd
e Please enter the commit message for ynund comments r changes. Lines…
AndreaRigoni Aug 26, 2021
ed90930
type
AndreaRigoni Aug 26, 2021
5097208
Wrong fix
AndreaRigoni Aug 26, 2021
700362e
MARTE2_SUPERVISOR improvements
Aug 26, 2021
b836cf1
Merge
Aug 26, 2021
8fee2b0
Merge branch 'gm-tree-thread' of https://github.com/MDSplus/mdsplus i…
Aug 26, 2021
67c7a38
Further devices
Aug 26, 2021
01d60ed
Updated pkg
AndreaRigoni Aug 26, 2021
b14bfc3
Open tree in every thread
Aug 26, 2021
9d1978d
clang-format
zack-vii Aug 26, 2021
de68338
somee python cleanup
zack-vii Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy/packaging/debian/kernel.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@
./usr/local/mdsplus/tdi/python/addfun.py
./usr/local/mdsplus/tdi/python/ctime.py
./usr/local/mdsplus/tdi/python/getShotDB.py
./usr/local/mdsplus/tdi/python/influxSignal.py
./usr/local/mdsplus/tdi/python/intersect1d.py
./usr/local/mdsplus/tdi/python/pyfun.py
./usr/local/mdsplus/tdi/python/setdiff1d.py
./usr/local/mdsplus/tdi/python/influxSignal.py
./usr/local/mdsplus/tdi/remote/GetManyExecute.fun
./usr/local/mdsplus/tdi/remote/ListConnections.fun
./usr/local/mdsplus/tdi/remote/MdsConnect.fun
Expand Down
12 changes: 6 additions & 6 deletions deploy/packaging/debian/matlab.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
./usr/local/mdsplus/matlab/MDSplusAPI.m
./usr/local/mdsplus/matlab/mdsFromMatlab.m
./usr/local/mdsplus/matlab/mdsInfo.m
./usr/local/mdsplus/matlab/mdsToMatlab.m
./usr/local/mdsplus/matlab/mdsUsePython.m
./usr/local/mdsplus/matlab/mdsclose.m
./usr/local/mdsplus/matlab/mdsconnect.m
./usr/local/mdsplus/matlab/mdsdisconnect.m
./usr/local/mdsplus/matlab/mdsFromMatlab.m
./usr/local/mdsplus/matlab/mdsgetmsg.m
./usr/local/mdsplus/matlab/mdsInfo.m
./usr/local/mdsplus/matlab/mdsopen.m
./usr/local/mdsplus/matlab/MDSplusAPI.m
./usr/local/mdsplus/matlab/mdsput.m
./usr/local/mdsplus/matlab/mdstcl.m
./usr/local/mdsplus/matlab/mdstest.m
./usr/local/mdsplus/matlab/mdsToMatlab.m
./usr/local/mdsplus/matlab/mdsUsePython.m
./usr/local/mdsplus/matlab/mdsvalue.m
./usr/local/mdsplus/matlab/private/javaActivate.m
./usr/local/mdsplus/matlab/private/javaConnect.m
Expand All @@ -21,4 +21,4 @@
./usr/local/mdsplus/matlab/private/pythonConnect.m
./usr/local/mdsplus/matlab/private/pythonExecute.m
./usr/local/mdsplus/matlab/private/pythonFromMatlab.m
./usr/local/mdsplus/matlab/private/pythonToMatlab.m
./usr/local/mdsplus/matlab/private/pythonToMatlab.m
4 changes: 4 additions & 0 deletions deploy/packaging/debian/rfxdevices.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
./usr/local/mdsplus/pydevices/RfxDevices/CAENV1740.py
./usr/local/mdsplus/pydevices/RfxDevices/CONTIPPSETUP.py
./usr/local/mdsplus/pydevices/RfxDevices/CRIO_FAU.py
./usr/local/mdsplus/pydevices/RfxDevices/CRIO_MPAG.py
./usr/local/mdsplus/pydevices/RfxDevices/CYGNET4K.py
./usr/local/mdsplus/pydevices/RfxDevices/DEMOADC.py
./usr/local/mdsplus/pydevices/RfxDevices/DEMOSTREAM.py
Expand Down Expand Up @@ -84,9 +85,12 @@
./usr/local/mdsplus/pydevices/RfxDevices/MARTE_WAVEGEN.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE_XRAY.py
./usr/local/mdsplus/pydevices/RfxDevices/MILL3.py
./usr/local/mdsplus/pydevices/RfxDevices/MITICA_SETUP.py
./usr/local/mdsplus/pydevices/RfxDevices/MITICA_SM.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6259AI.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6259EV.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6368AI.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6368EV.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6682.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6683.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6683REC.py
Expand Down
2 changes: 1 addition & 1 deletion deploy/packaging/redhat/kernel.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,10 @@
./usr/local/mdsplus/tdi/python/addfun.py
./usr/local/mdsplus/tdi/python/ctime.py
./usr/local/mdsplus/tdi/python/getShotDB.py
./usr/local/mdsplus/tdi/python/influxSignal.py
./usr/local/mdsplus/tdi/python/intersect1d.py
./usr/local/mdsplus/tdi/python/pyfun.py
./usr/local/mdsplus/tdi/python/setdiff1d.py
./usr/local/mdsplus/tdi/python/influxSignal.py
./usr/local/mdsplus/tdi/remote
./usr/local/mdsplus/tdi/remote/GetManyExecute.fun
./usr/local/mdsplus/tdi/remote/ListConnections.fun
Expand Down
12 changes: 6 additions & 6 deletions deploy/packaging/redhat/matlab.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
./usr/local/mdsplus/matlab
./usr/local/mdsplus/matlab/MDSplusAPI.m
./usr/local/mdsplus/matlab/mdsFromMatlab.m
./usr/local/mdsplus/matlab/mdsInfo.m
./usr/local/mdsplus/matlab/mdsToMatlab.m
./usr/local/mdsplus/matlab/mdsUsePython.m
./usr/local/mdsplus/matlab/mdsclose.m
./usr/local/mdsplus/matlab/mdsconnect.m
./usr/local/mdsplus/matlab/mdsdisconnect.m
./usr/local/mdsplus/matlab/mdsFromMatlab.m
./usr/local/mdsplus/matlab/mdsgetmsg.m
./usr/local/mdsplus/matlab/mdsInfo.m
./usr/local/mdsplus/matlab/mdsopen.m
./usr/local/mdsplus/matlab/MDSplusAPI.m
./usr/local/mdsplus/matlab/mdsput.m
./usr/local/mdsplus/matlab/mdstcl.m
./usr/local/mdsplus/matlab/mdstest.m
./usr/local/mdsplus/matlab/mdsToMatlab.m
./usr/local/mdsplus/matlab/mdsUsePython.m
./usr/local/mdsplus/matlab/mdsvalue.m
./usr/local/mdsplus/matlab/private
./usr/local/mdsplus/matlab/private/javaActivate.m
Expand All @@ -23,4 +23,4 @@
./usr/local/mdsplus/matlab/private/pythonConnect.m
./usr/local/mdsplus/matlab/private/pythonExecute.m
./usr/local/mdsplus/matlab/private/pythonFromMatlab.m
./usr/local/mdsplus/matlab/private/pythonToMatlab.m
./usr/local/mdsplus/matlab/private/pythonToMatlab.m
4 changes: 4 additions & 0 deletions deploy/packaging/redhat/rfxdevices.noarch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
./usr/local/mdsplus/pydevices/RfxDevices/CAENV1740.py
./usr/local/mdsplus/pydevices/RfxDevices/CONTIPPSETUP.py
./usr/local/mdsplus/pydevices/RfxDevices/CRIO_FAU.py
./usr/local/mdsplus/pydevices/RfxDevices/CRIO_MPAG.py
./usr/local/mdsplus/pydevices/RfxDevices/CYGNET4K.py
./usr/local/mdsplus/pydevices/RfxDevices/DEMOADC.py
./usr/local/mdsplus/pydevices/RfxDevices/DEMOSTREAM.py
Expand Down Expand Up @@ -85,9 +86,12 @@
./usr/local/mdsplus/pydevices/RfxDevices/MARTE_WAVEGEN.py
./usr/local/mdsplus/pydevices/RfxDevices/MARTE_XRAY.py
./usr/local/mdsplus/pydevices/RfxDevices/MILL3.py
./usr/local/mdsplus/pydevices/RfxDevices/MITICA_SETUP.py
./usr/local/mdsplus/pydevices/RfxDevices/MITICA_SM.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6259AI.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6259EV.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6368AI.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6368EV.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6682.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6683.py
./usr/local/mdsplus/pydevices/RfxDevices/NI6683REC.py
Expand Down
Loading