nqrduck/limedriver
1
0
Fork 0
mirror of https://github.com/nqrduck/LimeDriver.git synced 2024-11-25 03:22:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10 from nqrduck/dump_from_vector

Browse source 
Refactor configuration array to vector. 
Tested with LimeSDR USB - works!
This commit is contained in:
Julia Pfitzer 2024-02-07 15:08:51 +01:00 committed by GitHub
commit 980ae5ad34
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/limedriver.cpp
View file

@ -16,6 +16,7 @@ $(h5c++ -show) limedriver.cpp -std=c++11 $(pkg-config --cflags --libs LimeSuite)
#include "H5Cpp.h" #include "H5Cpp.h"
#include "lime/LimeSuite.h" #include "lime/LimeSuite.h"
#include <chrono> #include <chrono>
#include <cstddef>
#include <cstdlib> #include <cstdlib>
#include <fstream> #include <fstream>
#include <iomanip> #include <iomanip>
@ -370,14 +371,14 @@ std::vector<Config2HDFattr_t> getHDFAttributes(LimeConfig_t& LimeCfg) {
return HDFattr; return HDFattr;
} }
void dumpConfig(Config2HDFattr_t *config, size_t size) { void dumpConfig(std::vector<Config2HDFattr_t> &config) {
/* Dump the configuration to stdout in JSON format /* Dump the configuration to stdout in JSON format
@param config: Array of Config2HDFattr_t @param config: Array of Config2HDFattr_t
@param size: Size of the array
*/ */
size_t size = config.size();
int ii_oupargs = 0; // TODO: Better name int ii_oupargs = 0; // TODO: Better name
std::cout << "{" << std::endl; std::cout << "{" << std::endl;
@ -774,10 +775,6 @@ int main(int argc, char **argv) {
std::vector<Config2HDFattr_t> HDFattrVector = getHDFAttributes(LimeCfg); std::vector<Config2HDFattr_t> HDFattrVector = getHDFAttributes(LimeCfg);
size_t no_of_attr = HDFattrVector.size(); size_t no_of_attr = HDFattrVector.size();
// Converting to array to maintain compatibility with older code
Config2HDFattr_t HDFattr[no_of_attr];
std::copy(HDFattrVector.begin(), HDFattrVector.end(), HDFattr);
bool dumpFlag = false; bool dumpFlag = false;
// Checking for dump flag // Checking for dump flag
@ -789,7 +786,7 @@ int main(int argc, char **argv) {
// If dump flag is set, dump the config and exit // If dump flag is set, dump the config and exit
if (dumpFlag) { if (dumpFlag) {
dumpConfig(HDFattr, no_of_attr); dumpConfig(HDFattrVector);
std::exit(0); std::exit(0);
} }
@ -806,7 +803,8 @@ int main(int argc, char **argv) {
return 1; return 1;
} }
// Converting to array to maintain compatibility with older code and update // Converting to array to maintain compatibility with older code
Config2HDFattr_t HDFattr[no_of_attr];
std::copy(HDFattrVector.begin(), HDFattrVector.end(), HDFattr); std::copy(HDFattrVector.begin(), HDFattrVector.end(), HDFattr);
// Find devices // Find devices