yorick.geoffre
/
AHRS_core
1
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

fixed errors
continuous-integration/drone/push Build encountered an error Details

Browse Source
master
Yorick GEOFFRE 3 years ago
parent 0b223cf7e8
commit 2b305a16c5
39 changed files with 30 additions and 57 deletions
Show Stats Download Patch File Download Diff File

1
src/CMakeFiles/Progress/1
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/10
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/11
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/12
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/13
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/14
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/15
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/16
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/17
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/18
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/19
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/2
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/20
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/23
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/24
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/25
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/26
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/27
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/28
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/29
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/3
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/30
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/31
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/32
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/33
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/34
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/4
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/5
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/6
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/7
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/8
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/9
Unescape View File

@ -1 +0,0 @@
empty

1
src/CMakeFiles/Progress/count.txt
Unescape View File

@ -1 +0,0 @@
34

40
src/pipeline/CMakeFiles/pipelineLib.dir/build.make
Unescape View File

@ -69,10 +69,24 @@ include pipeline/CMakeFiles/pipelineLib.dir/progress.make
# Include the compile flags for this target's objects.
include pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o: pipeline/abstract/pipelineNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o -MF CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o.d -o CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/abstract/pipelineNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.i: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.i"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/pipeline/abstract/pipelineNode.cpp > CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.i
pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.s"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pipeline/abstract/pipelineNode.cpp -o CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.s
pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o: pipeline/members/cameraPickerNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o -MF CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/cameraPickerNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.i: cmake_force
@ -86,7 +100,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.s: cmake_force
pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o: pipeline/members/displayOutputNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o -MF CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/displayOutputNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.i: cmake_force
@ -100,7 +114,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.s: cmake_force
pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o: pipeline/members/uiDrawerNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o -MF CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/uiDrawerNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.i: cmake_force
@ -114,7 +128,7 @@ pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.s: cmake_force
pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o: pipeline/members/uiMergerNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o"
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o -MF CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o.d -o CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/members/uiMergerNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.i: cmake_force
@ -125,20 +139,6 @@ pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.s"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pipeline/members/uiMergerNode.cpp -o CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.s
pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o: pipeline/abstract/pipelineNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/kanken/code/AHRS_core/src/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o -MF CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o.d -o CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o -c /home/kanken/code/AHRS_core/src/pipeline/abstract/pipelineNode.cpp
pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.i: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.i"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/kanken/code/AHRS_core/src/pipeline/abstract/pipelineNode.cpp > CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.i
pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.s"
cd /home/kanken/code/AHRS_core/src/pipeline && /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/kanken/code/AHRS_core/src/pipeline/abstract/pipelineNode.cpp -o CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.s
pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/flags.make
pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: pipeline/pipeline.cpp
pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o: pipeline/CMakeFiles/pipelineLib.dir/compiler_depend.ts
@ -155,21 +155,21 @@ pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.s: cmake_force
# Object files for target pipelineLib
pipelineLib_OBJECTS = \
"CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o" \
"CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o" \
"CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o" \
"CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o" \
"CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o" \
"CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o" \
"CMakeFiles/pipelineLib.dir/pipeline.cpp.o"
# External object files for target pipelineLib
pipelineLib_EXTERNAL_OBJECTS =
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/pipeline.cpp.o
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/build.make
pipeline/libpipelineLib.a: pipeline/CMakeFiles/pipelineLib.dir/link.txt

2
src/pipeline/CMakeFiles/pipelineLib.dir/link.txt
Unescape View File

@ -1,2 +1,2 @@
/usr/bin/ar qc libpipelineLib.a CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o CMakeFiles/pipelineLib.dir/pipeline.cpp.o
/usr/bin/ar qc libpipelineLib.a CMakeFiles/pipelineLib.dir/abstract/pipelineNode.cpp.o CMakeFiles/pipelineLib.dir/members/cameraPickerNode.cpp.o CMakeFiles/pipelineLib.dir/members/displayOutputNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiDrawerNode.cpp.o CMakeFiles/pipelineLib.dir/members/uiMergerNode.cpp.o CMakeFiles/pipelineLib.dir/pipeline.cpp.o
/usr/bin/ranlib libpipelineLib.a

4
src/pipeline/CMakeLists.txt
Unescape View File

@ -1,4 +1,6 @@
set(pipeline_src
./abstract/pipelineNode.cpp
./abstract/pipelineNode.hpp
./members/cameraPickerNode.cpp
./members/cameraPickerNode.hpp
./members/displayOutputNode.cpp
@ -7,8 +9,6 @@ set(pipeline_src
./members/uiDrawerNode.hpp
./members/uiMergerNode.cpp
./members/uiMergerNode.hpp
./abstract/pipelineNode.cpp
./abstract/pipelineNode.hpp
./pipeline.cpp
./pipeline.hpp)
MESSAGE(STATUS "building pipeline")

5
src/pipeline/abstract/pipelineNode.cpp
Unescape View File

@ -1,5 +1,10 @@
#include "pipelineNode.hpp"
PipelineNode::PipelineNode()
{
}
bool PipelineNode::isRunning()
{
return this->shouldRun;

3
src/pipeline/abstract/pipelineNode.hpp
Unescape View File

@ -8,6 +8,7 @@
class PipelineNode{
public:
PipelineNode();
std::atomic_int fpsLimit = 60;
framerateChecker localES;
cv::UMat getOutput();
@ -18,10 +19,10 @@ class PipelineNode{
//virtual ~PipelineNode();
float cost = 1;
protected:
virtual void processFrame();
std::mutex outputLock;
cv::UMat output;
std::atomic_bool shouldRun;
std::atomic_bool disabled;
PipelineNode* previous;
virtual void processFrame()=0;
};

BIN
src/prog
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save