Skip to content
GitLab
Commit 6642a021 authored by Achim Morschhauser's avatar Achim Morschhauser
Browse files

Dynamic library

parent e97f3023
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 6642a021
*.o
*.cbp
*~
.settings/
*.anjuta*
......
makefile → Makefile
View file @ 6642a021
SRC_DIR=./src/
OBJ_DIR=./lib/
HDR_DIR=./include/
SRC_DIR=src/
OBJ_DIR=lib/
HDR_DIR=include/
LIB_DIR=/usr/lib/
USR_DIR=./usr/
BIN_DIR=./bin/
USR_DIR=usr/
BIN_DIR=bin/
#--------------------------------------
#--------------------------------------
......@@ -18,7 +19,7 @@ CCFLAGS=-g -lrt -std=c++11 -pthread
EXCL=driver_serial_emulate.o
# Uncomment to use virtual serial port. Run 'make clean all' afterwards
#EXCL=driver_serial.o
EXCL=driver_serial.o
.SECONDARY:
......@@ -28,13 +29,17 @@ all: $(USR_TARGET:%=$(BIN_DIR)%)
@echo ---- DONE ----
$(BIN_DIR)%: $(filter-out $(OBJ_DIR)$(EXCL) ,$(OBJ_FILES)) $(USR_DIR)%.cpp
$(CC) $(CCFLAGS) -o $(@) $^ -I./include/
$(BIN_DIR)%: $(USR_DIR)%.cpp $(LIB_DIR)libLogger.so
# $(CC) $(CCFLAGS) $< -o $@ -I$(HDR_DIR) -L$(LIB_DIR) -Wl,-rpath,"\$$ORIGIN/../$(LIB_DIR)" -lLogger
$(CC) $(CCFLAGS) $< -o $@ -I$(HDR_DIR) -L$(LIB_DIR) -lLogger
$(OBJ_DIR)%.o: $(SRC_DIR)%.cpp
mkdir -p $(OBJ_DIR)
$(CC) $(CCFLAGS) -c -o $@ $< -I$(HDR_DIR)
$(CC) $(CCFLAGS) -fPIC -c -o $@ $< -I$(HDR_DIR)
$(LIB_DIR)libLogger.so: $(filter-out $(OBJ_DIR)$(EXCL) ,$(OBJ_FILES))
$(CC) $^ -shared -o $@
clean:
rm $(BIN_DIR)*
rm $(OBJ_DIR)*
rm -f $(BIN_DIR)*
rm -f $(OBJ_DIR)*
rm -f $(LIB_DIR)libLogger.so
data/datafile deleted 100644 → 0
View file @ e97f3023
2018 06 22 15 49 18.008 -4.12785 -3.82701 -0.92068 0.00 0.00
2018 06 22 15 49 18.040 -4.12785 -3.82353 -0.92296 0.00 0.00
2018 06 22 15 49 18.072 -4.12553 -3.82237 -0.91954 0.00 0.00
2018 06 22 15 49 18.104 -4.12901 -3.82469 -0.92182 0.00 0.00
2018 06 22 15 49 18.136 -4.12669 -3.82237 -0.92410 0.00 0.00
2018 06 22 15 49 18.168 -4.12785 -3.82817 -0.91727 0.00 0.00
2018 06 22 15 49 18.200 -4.13016 -3.82701 -0.92068 0.00 0.00
2018 06 22 15 49 18.232 -4.12901 -3.82237 -0.92068 0.00 0.00
2018 06 22 15 49 18.264 -4.12785 -3.82237 -0.91727 0.00 0.00
2018 06 22 15 49 18.296 -4.12785 -3.82585 -0.92182 0.00 0.00
2018 06 22 15 49 18.328 -4.12785 -3.82353 -0.92068 0.00 0.00
2018 06 22 15 49 18.360 -4.12901 -3.82353 -0.92524 0.00 0.00
2018 06 22 15 49 18.392 -4.13016 -3.82237 -0.92068 0.00 0.00
2018 06 22 15 49 18.424 -4.12553 -3.82469 -0.92410 0.00 0.00
2018 06 22 15 49 18.456 -4.12669 -3.82585 -0.92296 0.00 0.00
2018 06 22 15 49 18.488 -4.13248 -3.82469 -0.92296 0.00 0.00
2018 06 22 15 49 18.520 -4.13132 -3.82469 -0.92296 0.00 0.00
2018 06 22 15 49 18.552 -4.12785 -3.82933 -0.92296 0.00 0.00
2018 06 22 15 49 18.584 -4.12669 -3.82237 -0.92068 -4.08 0.00
2018 06 22 15 49 18.600 -4.12438 -3.82237 -0.92068 0.00 0.00
2018 06 22 15 49 18.632 -4.13016 -3.82122 -0.92296 0.00 0.00
2018 06 22 15 49 18.664 -4.14058 -3.83513 -0.93664 0.00 -4.08
2018 06 22 15 49 18.696 -4.13826 -3.83745 -0.93892 0.00 0.00
2018 06 22 15 49 18.728 -4.13826 -3.84324 -0.93664 0.00 0.00
2018 06 22 15 49 18.760 -4.14174 -3.83861 -0.93550 0.00 0.00
2018 06 22 15 49 18.792 -4.13942 -3.83745 -0.93892 0.00 0.00
2018 06 22 15 49 18.824 -4.13826 -3.83976 -0.94005 0.00 0.00
2018 06 22 15 49 18.856 -4.13826 -3.83745 -0.94005 0.00 0.00
2018 06 22 15 49 18.888 -4.14058 -3.83745 -0.93550 0.00 0.00
2018 06 22 15 49 18.920 -4.14289 -3.83861 -0.93550 0.00 0.00
2018 06 22 15 49 18.952 -4.13826 -3.83861 -0.93778 0.00 0.00
2018 06 22 15 49 18.984 -4.13942 -3.84092 -0.93664 0.00 0.00
2018 06 22 15 49 19.016 -4.13942 -3.83629 -0.93550 0.00 0.00
2018 06 22 15 49 19.048 -4.14058 -3.83513 -0.93664 0.00 0.00
2018 06 22 15 49 19.080 -4.14174 -3.83745 -0.93664 0.00 0.00
2018 06 22 15 49 19.112 -4.13942 -3.83745 -0.93664 -4.08 0.00
2018 06 22 15 49 19.144 -4.14058 -3.83745 -0.93550 0.00 0.00
2018 06 22 15 49 19.176 -4.14058 -3.83745 -0.93664 0.00 0.00
2018 06 22 15 49 19.208 -4.13942 -3.83629 -0.93664 0.00 -4.08
2018 06 22 15 49 19.240 -4.13942 -3.83513 -0.93550 0.00 0.00
2018 06 22 15 49 19.272 -4.13826 -3.83629 -0.93778 0.00 0.00
2018 06 22 15 49 19.288 -4.13595 -3.83629 -0.93778 0.00 0.00
2018 06 22 15 49 19.320 -4.13942 -3.83513 -0.93550 0.00 0.00
2018 06 22 15 49 19.352 -4.14058 -3.83976 -0.93550 0.00 0.00
2018 06 22 15 49 19.384 -4.13826 -3.83745 -0.93550 0.00 0.00
2018 06 22 15 49 19.416 -4.14289 -3.83629 -0.93778 0.00 0.00
2018 06 22 15 49 19.448 -4.14174 -3.84324 -0.93664 0.00 0.00
2018 06 22 15 49 19.480 -4.13711 -3.83513 -0.93778 0.00 0.00
2018 06 22 15 49 19.512 -4.13826 -3.83861 -0.93664 0.00 0.00
2018 06 22 15 49 19.544 -4.13942 -3.83861 -0.93892 0.00 0.00
2018 06 22 15 49 19.576 -4.13942 -3.83745 -0.93778 0.00 0.00
2018 06 22 15 49 19.608 -4.13942 -3.83861 -0.93778 0.00 0.00
2018 06 22 15 49 19.639 -4.13595 -3.83861 -0.93664 -4.08 0.00
2018 06 22 15 49 19.671 -4.14174 -3.83861 -0.94005 0.00 0.00
2018 06 22 15 49 19.703 -4.14174 -3.83745 -0.93664 0.00 0.00
2018 06 22 15 49 19.735 -4.13826 -3.83745 -0.93778 0.00 -4.08
2018 06 22 15 49 19.767 -4.13942 -3.83629 -0.94119 0.00 0.00
2018 06 22 15 49 19.799 -4.14174 -3.83629 -0.93892 0.00 0.00
2018 06 22 15 49 19.831 -4.13942 -3.83629 -0.93778 0.00 0.00
2018 06 22 15 49 19.863 -4.14058 -3.83745 -0.93664 0.00 0.00
2018 06 22 15 49 19.895 -4.14174 -3.83976 -0.93778 0.00 0.00
2018 06 22 15 49 19.927 -4.13711 -3.83629 -0.93436 0.00 0.00
2018 06 22 15 49 19.959 -4.13942 -3.83976 -0.94005 0.00 0.00
2018 06 22 15 49 19.975 -4.14058 -3.83629 -0.93778 0.00 0.00
2018 06 22 15 49 20.007 -4.14058 -3.84092 -0.93778 0.00 0.00
2018 06 22 15 49 20.039 -4.13942 -3.83745 -0.93778 0.00 0.00
2018 06 22 15 49 20.071 -4.13595 -3.83861 -0.93664 0.00 0.00
2018 06 22 15 49 20.103 -4.14058 -3.84324 -0.93778 0.00 0.00
2018 06 22 15 49 20.135 -4.13595 -3.83745 -0.93208 0.00 0.00
2018 06 22 15 49 20.167 -4.13595 -3.83513 -0.93664 -4.08 0.00
2018 06 22 15 49 20.199 -4.13826 -3.83861 -0.93778 0.00 0.00
2018 06 22 15 49 20.231 -4.13942 -3.83281 -0.93322 0.00 0.00
2018 06 22 15 49 20.263 -4.14058 -3.83513 -0.93436 0.00 0.00
2018 06 22 15 49 20.295 -4.13942 -3.83976 -0.93436 0.00 -4.08
2018 06 22 15 49 20.327 -4.13826 -3.83861 -0.94005 0.00 0.00
2018 06 22 15 49 20.359 -4.13942 -3.83976 -0.93664 0.00 0.00
2018 06 22 15 49 20.391 -4.14174 -3.84092 -0.93778 0.00 0.00
2018 06 22 15 49 20.423 -4.13942 -3.83745 -0.93778 0.00 0.00
2018 06 22 15 49 20.455 -4.14174 -3.83976 -0.93664 0.00 0.00
2018 06 22 15 49 20.487 -4.13711 -3.83976 -0.94233 0.00 0.00
2018 06 22 15 49 20.519 -4.14058 -3.83629 -0.93664 0.00 0.00
2018 06 22 15 49 20.551 -4.14058 -3.83861 -0.93892 0.00 0.00
2018 06 22 15 49 20.583 -4.14174 -3.83745 -0.93778 0.00 0.00
2018 06 22 15 49 20.615 -4.13942 -3.83629 -0.93664 0.00 0.00
2018 06 22 15 49 20.647 -4.13942 -3.83861 -0.93664 0.00 0.00
2018 06 22 15 49 20.663 -4.14174 -3.83861 -0.93664 0.00 0.00
2018 06 22 15 49 20.695 -4.14174 -3.83629 -0.94005 -4.08 0.00
2018 06 22 15 49 20.727 -4.14289 -3.83745 -0.94005 0.00 0.00
2018 06 22 15 49 20.759 -4.14174 -3.83861 -0.93322 0.00 0.00
2018 06 22 15 49 20.791 -4.13942 -3.83861 -0.93550 0.00 0.00
2018 06 22 15 49 20.823 -4.14058 -3.83745 -0.93892 0.00 -4.08
2018 06 22 15 49 20.855 -4.14174 -3.83745 -0.93664 0.00 0.00
2018 06 22 15 49 20.887 -4.13711 -3.83745 -0.93778 0.00 0.00
2018 06 22 15 49 20.919 -4.13826 -3.83861 -0.93778 0.00 0.00
2018 06 22 15 49 20.951 -4.13711 -3.83745 -0.93664 0.00 0.00
2018 06 22 15 49 20.983 -4.14058 -3.83629 -0.93550 0.00 0.00
2018 06 22 15 49 21.015 -4.14289 -3.83629 -0.94119 0.00 0.00
2018 06 22 15 49 21.047 -4.13826 -3.83629 -0.94005 0.00 0.00
2018 06 22 15 49 21.079 -4.14174 -3.83861 -0.94005 0.00 0.00
2018 06 22 15 49 21.111 -4.14289 -3.83976 -0.93436 0.00 0.00
2018 06 22 15 49 21.143 -4.13826 -3.83861 -0.93892 0.00 0.00
2018 06 22 15 49 21.175 -4.14058 -3.83861 -0.93892 0.00 0.00
2018 06 22 15 49 21.207 -4.13942 -3.83861 -0.94119 0.00 0.00
2018 06 22 15 49 21.239 -4.14058 -3.83861 -0.93892 -4.08 0.00
2018 06 22 15 49 21.270 -4.14058 -3.83861 -0.94005 0.00 0.00
2018 06 22 15 49 21.303 -4.14174 -3.83629 -0.93664 0.00 0.00
2018 06 22 15 49 21.319 -4.13942 -3.83976 -0.93550 0.00 0.00
2018 06 22 15 49 21.351 -4.13942 -3.83976 -0.94119 0.00 -4.08
2018 06 22 15 49 21.382 -4.13942 -3.83629 -0.93436 0.00 0.00
2018 06 22 15 49 21.414 -4.14058 -3.83861 -0.93778 0.00 0.00
2018 06 22 15 49 21.446 -4.14174 -3.84092 -0.93892 0.00 0.00
2018 06 22 15 49 21.478 -4.13942 -3.83745 -0.93778 0.00 0.00
2018 06 22 15 49 21.510 -4.13942 -3.83745 -0.93892 0.00 0.00
2018 06 22 15 49 21.542 -4.14289 -3.83629 -0.93778 0.00 0.00
2018 06 22 15 49 21.574 -4.14058 -3.83745 -0.93436 0.00 0.00
2018 06 22 15 49 21.606 -4.14058 -3.84208 -0.93664 0.00 0.00
2018 06 22 15 49 21.638 -4.13942 -3.83861 -0.93892 0.00 0.00
2018 06 22 15 49 21.670 -4.14058 -3.83861 -0.93778 0.00 0.00
src/Filter_Obs.cpp
View file @ 6642a021
......@@ -257,17 +257,15 @@ int Filter_Obs::lowpass_PLASMON_1Hz(buffer_obs* buffer_in,
// Read the data
buffer_in->pop(data);
// Add to filter1 queue
tofilter1.push_back(new data_obs_vector(data));
// Wait for downsampling and apply filter1
if (filter1_count==filter1_sample){
//fprintf(stderr,"TEST: %f\n",data->get_X());
data->filter_fir_sym(&tofilter1,&filter1_win);
tofilter2.push_back(new data_obs_vector(data));
// Wait until filter2 queue is filled
if (tofilter2.size()==filter2_win.size()){
......
src/data_obs_vector.cpp
View file @ 6642a021
......@@ -389,8 +389,6 @@ int data_obs_vector::filter_fir_sym(std::vector <data_obs*>* data,
this->Y=Yf+1/(N-YmN)*Ym*Ys;
this->Z=Zf+1/(N-ZmN)*Zm*Zs;
//fprintf(stderr,"FILTER: %f\n",this->X);
return(0);
}
tee deleted 100644 → 0
View file @ e97f3023
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment