Skip to content

Cs update ni #2539

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
GabrieleManduchi merged 3 commits into from
Mar 9, 2023
Merged

Cs update ni #2539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af2ebac
Major update of NI6683, NI6368EV and fix on CRIO_MPAG devices
Mar 2, 2023
2f38fa6
Marge from alpha
Mar 2, 2023
fa5be69
Merge branch 'alpha' into cs-update-ni
AndreaRigoni Mar 9, 2023
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
514 changes: 315 additions & 199 deletions device_support/national/AsyncStoreManager.cpp
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions device_support/national/AsyncStoreManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@
#include <unordered_map>
#include <vector>


using namespace MDSplus;
using namespace std;


class SaveItem
{

private:
bool isUpdate;
void *buffer;
char dataType;
int bufSize;
Expand All @@ -44,6 +47,10 @@ class SaveItem
int gain;
int numCoeffs;
float *coeffs;
Data *startPtr;
Data *endPtr;
Data *dimPtr;
Data * dimResPtr;

vector<string> split(const char *str, char c = ' ')
{
Expand Down Expand Up @@ -94,6 +101,9 @@ class SaveItem
double period, float gain, float *coeffs, int numCoeffs,
int resampledNid);

SaveItem(int dataNid, void *treePtr, MDSplus::Data *startPtr,
MDSplus::Data *endPtr, MDSplus::Data *dimPtr, MDSplus::Data *dimResPtr, int resampledNid);

void setNext(SaveItem *itm) { nxt = itm; }
SaveItem *getNext() { return nxt; }

Expand Down Expand Up @@ -137,6 +147,9 @@ class SaveList
double period, float gain, float *coeffs, int numCoeffs,
int resampledNid = -1);

void addItem(int dataNid, void *treePtr, MDSplus::Data *startPtr,
MDSplus::Data *endPtr, MDSplus::Data *dimPtr, MDSplus::Data *dimResPtr, int resampledNid);

void executeItems();
void start();
void stop();
Expand Down
2 changes: 1 addition & 1 deletion device_support/national/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ CFLAGS_RELEASE := -fPIC -O3
LDFLAGS_RELEASE =

CFLAGS = -fPIC -O3 -I${MDSPLUS_DIR}/include -I${CODAC_ROOT}/include -std=c++11
LDFLAGS = -fPIC -O0 -L${MDSPLUS_DIR}/lib -L${CODAC_ROOT}/lib/ -lm -lNiFpga -lpxi6259 -lnixseries -lpthread -lMdsObjectsCppShr -ltcn
LDFLAGS = -fPIC -O0 -L${MDSPLUS_DIR}/lib -L${CODAC_ROOT}/lib/ -lm -lNiFpga -lpxi6259 -lnixseries -lpthread -lMdsObjectsCppShr -ltcn -lnisync

# Debug builds (make debug)

Expand Down
Loading