[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[cash2ecash] branch master updated: some bugfixes
|
From: |
gnunet |
|
Subject: |
[cash2ecash] branch master updated: some bugfixes |
|
Date: |
Fri, 20 Dec 2024 20:45:12 +0100 |
This is an automated email from the git hooks/post-receive script.
manuel-geissbuehler pushed a commit to branch master
in repository cash2ecash.
The following commit(s) were added to refs/heads/master by this push:
new 44ef670 some bugfixes
44ef670 is described below
commit 44ef6702da8f48e318dc6be17b378f122612674a
Author: Manuel Geissbühler <geissbuehler.manuel@gmail.com>
AuthorDate: Fri Dec 20 20:44:30 2024 +0100
some bugfixes
---
build/CMakeCache.txt | 12 ++++++------
build/Makefile | 8 ++++----
build/bank/Makefile | 20 ++++++++++----------
build/cash2ecash | Bin 237264 -> 248288 bytes
build/cashacceptor/Makefile | 36 ++++++++++++++++++------------------
build/compile_commands.json | 24 ++++++++++++------------
build/extern/Makefile | 20 ++++++++++----------
build/gui/Makefile | 20 ++++++++++----------
build/identification/Makefile | 20 ++++++++++----------
build/utils/Makefile | 30 +++++++++++++++---------------
src/cash2ecash.cpp | 7 ++++---
src/cashacceptor/dg600f.cpp | 16 +++++++++++-----
src/cashacceptor/dg600f.hpp | 2 +-
src/utils/timer.hpp | 2 +-
14 files changed, 112 insertions(+), 105 deletions(-)
diff --git a/build/CMakeCache.txt b/build/CMakeCache.txt
index 00b8b40..b58a861 100644
--- a/build/CMakeCache.txt
+++ b/build/CMakeCache.txt
@@ -1,5 +1,5 @@
# This is the CMakeCache file.
-# For build in directory:
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build
+# For build in directory: /home/cash2ecash/Documents/cash2ecash/build
# It was generated by CMake: /usr/bin/cmake
# You can edit this file to change values found and used by cmake.
# If you do not want to change any of the values, simply exit the editor.
@@ -101,7 +101,7 @@ CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO:STRING=
CMAKE_EXPORT_COMPILE_COMMANDS:BOOL=
//Value Computed by CMake.
-CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles/pkgRedirects
+CMAKE_FIND_PACKAGE_REDIRECTS_DIR:STATIC=/home/cash2ecash/Documents/cash2ecash/build/CMakeFiles/pkgRedirects
//Install path prefix, prepended onto install directories.
CMAKE_INSTALL_PREFIX:PATH=/usr/local
@@ -213,13 +213,13 @@ CMAKE_STRIP:FILEPATH=/usr/bin/strip
CMAKE_VERBOSE_MAKEFILE:BOOL=FALSE
//Value Computed by CMake
-cash2ecash_BINARY_DIR:STATIC=/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build
+cash2ecash_BINARY_DIR:STATIC=/home/cash2ecash/Documents/cash2ecash/build
//Value Computed by CMake
cash2ecash_IS_TOP_LEVEL:STATIC=ON
//Value Computed by CMake
-cash2ecash_SOURCE_DIR:STATIC=/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src
+cash2ecash_SOURCE_DIR:STATIC=/home/cash2ecash/Documents/cash2ecash/src
//Dependencies for the target
cashacceptor_LIB_DEPENDS:STATIC=general;gnunetutil;general;talerutil;
@@ -234,7 +234,7 @@ CMAKE_ADDR2LINE-ADVANCED:INTERNAL=1
//ADVANCED property for variable: CMAKE_AR
CMAKE_AR-ADVANCED:INTERNAL=1
//This is the directory where this CMakeCache.txt was created
-CMAKE_CACHEFILE_DIR:INTERNAL=/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build
+CMAKE_CACHEFILE_DIR:INTERNAL=/home/cash2ecash/Documents/cash2ecash/build
//Major version of cmake used to create the current loaded cache
CMAKE_CACHE_MAJOR_VERSION:INTERNAL=3
//Minor version of cmake used to create the current loaded cache
@@ -309,7 +309,7 @@ CMAKE_GENERATOR_PLATFORM:INTERNAL=
CMAKE_GENERATOR_TOOLSET:INTERNAL=
//Source directory with the top level CMakeLists.txt file for this
// project
-CMAKE_HOME_DIRECTORY:INTERNAL=/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src
+CMAKE_HOME_DIRECTORY:INTERNAL=/home/cash2ecash/Documents/cash2ecash/src
//Install .so files without execute permission.
CMAKE_INSTALL_SO_NO_EXE:INTERNAL=1
//ADVANCED property for variable: CMAKE_LINKER
diff --git a/build/Makefile b/build/Makefile
index 03ec8d0..30f428c 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -57,10 +57,10 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src
+CMAKE_SOURCE_DIR = /home/cash2ecash/Documents/cash2ecash/src
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build
+CMAKE_BINARY_DIR = /home/cash2ecash/Documents/cash2ecash/build
#=============================================================================
# Targets provided globally by CMake.
@@ -87,9 +87,9 @@ rebuild_cache/fast: rebuild_cache
# The main all target
all: cmake_check_build_system
- $(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build//CMakeFiles/progress.marks
+ $(CMAKE_COMMAND) -E cmake_progress_start
/home/cash2ecash/Documents/cash2ecash/build/CMakeFiles
/home/cash2ecash/Documents/cash2ecash/build//CMakeFiles/progress.marks
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 all
- $(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
0
+ $(CMAKE_COMMAND) -E cmake_progress_start
/home/cash2ecash/Documents/cash2ecash/build/CMakeFiles 0
.PHONY : all
# The main clean target
diff --git a/build/bank/Makefile b/build/bank/Makefile
index aeb9b0b..f231356 100644
--- a/build/bank/Makefile
+++ b/build/bank/Makefile
@@ -57,10 +57,10 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src
+CMAKE_SOURCE_DIR = /home/cash2ecash/Documents/cash2ecash/src
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build
+CMAKE_BINARY_DIR = /home/cash2ecash/Documents/cash2ecash/build
#=============================================================================
# Targets provided globally by CMake.
@@ -87,14 +87,14 @@ rebuild_cache/fast: rebuild_cache
# The main all target
all: cmake_check_build_system
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/bank//CMakeFiles/progress.marks
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 bank/all
- $(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND) -E
cmake_progress_start /home/cash2ecash/Documents/cash2ecash/build/CMakeFiles
/home/cash2ecash/Documents/cash2ecash/build/bank//CMakeFiles/progress.marks
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 bank/all
+ $(CMAKE_COMMAND) -E cmake_progress_start
/home/cash2ecash/Documents/cash2ecash/build/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 bank/clean
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 bank/clean
.PHONY : clean
# The main clean target
@@ -103,17 +103,17 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 bank/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 bank/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 bank/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 bank/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Help Target
@@ -135,6 +135,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/build/cash2ecash b/build/cash2ecash
index 63c8338..96c3ddc 100755
Binary files a/build/cash2ecash and b/build/cash2ecash differ
diff --git a/build/cashacceptor/Makefile b/build/cashacceptor/Makefile
index cfc6142..800f251 100644
--- a/build/cashacceptor/Makefile
+++ b/build/cashacceptor/Makefile
@@ -57,10 +57,10 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src
+CMAKE_SOURCE_DIR = /home/cash2ecash/Documents/cash2ecash/src
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build
+CMAKE_BINARY_DIR = /home/cash2ecash/Documents/cash2ecash/build
#=============================================================================
# Targets provided globally by CMake.
@@ -87,14 +87,14 @@ rebuild_cache/fast: rebuild_cache
# The main all target
all: cmake_check_build_system
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/cashacceptor//CMakeFiles/progress.marks
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 cashacceptor/all
- $(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND) -E
cmake_progress_start /home/cash2ecash/Documents/cash2ecash/build/CMakeFiles
/home/cash2ecash/Documents/cash2ecash/build/cashacceptor//CMakeFiles/progress.marks
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 cashacceptor/all
+ $(CMAKE_COMMAND) -E cmake_progress_start
/home/cash2ecash/Documents/cash2ecash/build/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 cashacceptor/clean
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 cashacceptor/clean
.PHONY : clean
# The main clean target
@@ -103,22 +103,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 cashacceptor/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 cashacceptor/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 cashacceptor/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 cashacceptor/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
cashacceptor/CMakeFiles/cashacceptor.dir/rule:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2
cashacceptor/CMakeFiles/cashacceptor.dir/rule
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 cashacceptor/CMakeFiles/cashacceptor.dir/rule
.PHONY : cashacceptor/CMakeFiles/cashacceptor.dir/rule
# Convenience name for target.
@@ -127,7 +127,7 @@ cashacceptor: cashacceptor/CMakeFiles/cashacceptor.dir/rule
# fast build rule for target.
cashacceptor/fast:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/build
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/build
.PHONY : cashacceptor/fast
cashacceptor.o: cashacceptor.cpp.o
@@ -135,7 +135,7 @@ cashacceptor.o: cashacceptor.cpp.o
# target to build an object file
cashacceptor.cpp.o:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/cashacceptor.cpp.o
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/cashacceptor.cpp.o
.PHONY : cashacceptor.cpp.o
cashacceptor.i: cashacceptor.cpp.i
@@ -143,7 +143,7 @@ cashacceptor.i: cashacceptor.cpp.i
# target to preprocess a source file
cashacceptor.cpp.i:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/cashacceptor.cpp.i
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/cashacceptor.cpp.i
.PHONY : cashacceptor.cpp.i
cashacceptor.s: cashacceptor.cpp.s
@@ -151,7 +151,7 @@ cashacceptor.s: cashacceptor.cpp.s
# target to generate assembly for a file
cashacceptor.cpp.s:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/cashacceptor.cpp.s
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/cashacceptor.cpp.s
.PHONY : cashacceptor.cpp.s
dg600f.o: dg600f.cpp.o
@@ -159,7 +159,7 @@ dg600f.o: dg600f.cpp.o
# target to build an object file
dg600f.cpp.o:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/dg600f.cpp.o
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/dg600f.cpp.o
.PHONY : dg600f.cpp.o
dg600f.i: dg600f.cpp.i
@@ -167,7 +167,7 @@ dg600f.i: dg600f.cpp.i
# target to preprocess a source file
dg600f.cpp.i:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/dg600f.cpp.i
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/dg600f.cpp.i
.PHONY : dg600f.cpp.i
dg600f.s: dg600f.cpp.s
@@ -175,7 +175,7 @@ dg600f.s: dg600f.cpp.s
# target to generate assembly for a file
dg600f.cpp.s:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/dg600f.cpp.s
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f cashacceptor/CMakeFiles/cashacceptor.dir/build.make
cashacceptor/CMakeFiles/cashacceptor.dir/dg600f.cpp.s
.PHONY : dg600f.cpp.s
# Help Target
@@ -204,6 +204,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/build/compile_commands.json b/build/compile_commands.json
index d393dd2..abfd185 100644
--- a/build/compile_commands.json
+++ b/build/compile_commands.json
@@ -1,22 +1,22 @@
[
{
- "directory":
"/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build",
- "command": "/usr/bin/c++
-I/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/include
-g -o CMakeFiles/cash2ecash.dir/cash2ecash.cpp.o -c
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/cash2ecash.cpp",
- "file":
"/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/cash2ecash.cpp"
+ "directory": "/home/cash2ecash/Documents/cash2ecash/build",
+ "command": "/usr/bin/c++
-I/home/cash2ecash/Documents/cash2ecash/src/include -g -o
CMakeFiles/cash2ecash.dir/cash2ecash.cpp.o -c
/home/cash2ecash/Documents/cash2ecash/src/cash2ecash.cpp",
+ "file": "/home/cash2ecash/Documents/cash2ecash/src/cash2ecash.cpp"
},
{
- "directory":
"/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/cashacceptor",
- "command": "/usr/bin/c++
-I/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/include
-g -o CMakeFiles/cashacceptor.dir/cashacceptor.cpp.o -c
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/cashacceptor/cashacceptor.cpp",
- "file":
"/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/cashacceptor/cashacceptor.cpp"
+ "directory": "/home/cash2ecash/Documents/cash2ecash/build/cashacceptor",
+ "command": "/usr/bin/c++
-I/home/cash2ecash/Documents/cash2ecash/src/include -g -o
CMakeFiles/cashacceptor.dir/cashacceptor.cpp.o -c
/home/cash2ecash/Documents/cash2ecash/src/cashacceptor/cashacceptor.cpp",
+ "file":
"/home/cash2ecash/Documents/cash2ecash/src/cashacceptor/cashacceptor.cpp"
},
{
- "directory":
"/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/cashacceptor",
- "command": "/usr/bin/c++
-I/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/include
-g -o CMakeFiles/cashacceptor.dir/dg600f.cpp.o -c
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/cashacceptor/dg600f.cpp",
- "file":
"/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/cashacceptor/dg600f.cpp"
+ "directory": "/home/cash2ecash/Documents/cash2ecash/build/cashacceptor",
+ "command": "/usr/bin/c++
-I/home/cash2ecash/Documents/cash2ecash/src/include -g -o
CMakeFiles/cashacceptor.dir/dg600f.cpp.o -c
/home/cash2ecash/Documents/cash2ecash/src/cashacceptor/dg600f.cpp",
+ "file": "/home/cash2ecash/Documents/cash2ecash/src/cashacceptor/dg600f.cpp"
},
{
- "directory":
"/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/utils",
- "command": "/usr/bin/c++
-I/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/include
-g -o CMakeFiles/utils.dir/timer.cpp.o -c
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/utils/timer.cpp",
- "file":
"/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/utils/timer.cpp"
+ "directory": "/home/cash2ecash/Documents/cash2ecash/build/utils",
+ "command": "/usr/bin/c++
-I/home/cash2ecash/Documents/cash2ecash/src/include -g -o
CMakeFiles/utils.dir/timer.cpp.o -c
/home/cash2ecash/Documents/cash2ecash/src/utils/timer.cpp",
+ "file": "/home/cash2ecash/Documents/cash2ecash/src/utils/timer.cpp"
}
]
\ No newline at end of file
diff --git a/build/extern/Makefile b/build/extern/Makefile
index 9ace763..318172d 100644
--- a/build/extern/Makefile
+++ b/build/extern/Makefile
@@ -57,10 +57,10 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src
+CMAKE_SOURCE_DIR = /home/cash2ecash/Documents/cash2ecash/src
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build
+CMAKE_BINARY_DIR = /home/cash2ecash/Documents/cash2ecash/build
#=============================================================================
# Targets provided globally by CMake.
@@ -87,14 +87,14 @@ rebuild_cache/fast: rebuild_cache
# The main all target
all: cmake_check_build_system
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/extern//CMakeFiles/progress.marks
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 extern/all
- $(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND) -E
cmake_progress_start /home/cash2ecash/Documents/cash2ecash/build/CMakeFiles
/home/cash2ecash/Documents/cash2ecash/build/extern//CMakeFiles/progress.marks
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 extern/all
+ $(CMAKE_COMMAND) -E cmake_progress_start
/home/cash2ecash/Documents/cash2ecash/build/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 extern/clean
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 extern/clean
.PHONY : clean
# The main clean target
@@ -103,17 +103,17 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 extern/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 extern/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 extern/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 extern/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Help Target
@@ -135,6 +135,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/build/gui/Makefile b/build/gui/Makefile
index 5fc87c9..8e64034 100644
--- a/build/gui/Makefile
+++ b/build/gui/Makefile
@@ -57,10 +57,10 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src
+CMAKE_SOURCE_DIR = /home/cash2ecash/Documents/cash2ecash/src
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build
+CMAKE_BINARY_DIR = /home/cash2ecash/Documents/cash2ecash/build
#=============================================================================
# Targets provided globally by CMake.
@@ -87,14 +87,14 @@ rebuild_cache/fast: rebuild_cache
# The main all target
all: cmake_check_build_system
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/gui//CMakeFiles/progress.marks
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 gui/all
- $(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND) -E
cmake_progress_start /home/cash2ecash/Documents/cash2ecash/build/CMakeFiles
/home/cash2ecash/Documents/cash2ecash/build/gui//CMakeFiles/progress.marks
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 gui/all
+ $(CMAKE_COMMAND) -E cmake_progress_start
/home/cash2ecash/Documents/cash2ecash/build/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 gui/clean
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 gui/clean
.PHONY : clean
# The main clean target
@@ -103,17 +103,17 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 gui/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 gui/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 gui/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 gui/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Help Target
@@ -135,6 +135,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/build/identification/Makefile b/build/identification/Makefile
index 9c807b5..7b684ed 100644
--- a/build/identification/Makefile
+++ b/build/identification/Makefile
@@ -57,10 +57,10 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src
+CMAKE_SOURCE_DIR = /home/cash2ecash/Documents/cash2ecash/src
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build
+CMAKE_BINARY_DIR = /home/cash2ecash/Documents/cash2ecash/build
#=============================================================================
# Targets provided globally by CMake.
@@ -87,14 +87,14 @@ rebuild_cache/fast: rebuild_cache
# The main all target
all: cmake_check_build_system
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/identification//CMakeFiles/progress.marks
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 identification/all
- $(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND) -E
cmake_progress_start /home/cash2ecash/Documents/cash2ecash/build/CMakeFiles
/home/cash2ecash/Documents/cash2ecash/build/identification//CMakeFiles/progress.marks
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 identification/all
+ $(CMAKE_COMMAND) -E cmake_progress_start
/home/cash2ecash/Documents/cash2ecash/build/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 identification/clean
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 identification/clean
.PHONY : clean
# The main clean target
@@ -103,17 +103,17 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 identification/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 identification/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 identification/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 identification/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Help Target
@@ -135,6 +135,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/build/utils/Makefile b/build/utils/Makefile
index c0d15c6..de1ea40 100644
--- a/build/utils/Makefile
+++ b/build/utils/Makefile
@@ -57,10 +57,10 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src
+CMAKE_SOURCE_DIR = /home/cash2ecash/Documents/cash2ecash/src
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR =
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build
+CMAKE_BINARY_DIR = /home/cash2ecash/Documents/cash2ecash/build
#=============================================================================
# Targets provided globally by CMake.
@@ -87,14 +87,14 @@ rebuild_cache/fast: rebuild_cache
# The main all target
all: cmake_check_build_system
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/utils//CMakeFiles/progress.marks
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 utils/all
- $(CMAKE_COMMAND) -E cmake_progress_start
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/CMakeFiles
0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND) -E
cmake_progress_start /home/cash2ecash/Documents/cash2ecash/build/CMakeFiles
/home/cash2ecash/Documents/cash2ecash/build/utils//CMakeFiles/progress.marks
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 utils/all
+ $(CMAKE_COMMAND) -E cmake_progress_start
/home/cash2ecash/Documents/cash2ecash/build/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 utils/clean
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 utils/clean
.PHONY : clean
# The main clean target
@@ -103,22 +103,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 utils/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 utils/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 utils/preinstall
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 utils/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
utils/CMakeFiles/utils.dir/rule:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 utils/CMakeFiles/utils.dir/rule
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f CMakeFiles/Makefile2 utils/CMakeFiles/utils.dir/rule
.PHONY : utils/CMakeFiles/utils.dir/rule
# Convenience name for target.
@@ -127,7 +127,7 @@ utils: utils/CMakeFiles/utils.dir/rule
# fast build rule for target.
utils/fast:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f utils/CMakeFiles/utils.dir/build.make
utils/CMakeFiles/utils.dir/build
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f utils/CMakeFiles/utils.dir/build.make utils/CMakeFiles/utils.dir/build
.PHONY : utils/fast
timer.o: timer.cpp.o
@@ -135,7 +135,7 @@ timer.o: timer.cpp.o
# target to build an object file
timer.cpp.o:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f utils/CMakeFiles/utils.dir/build.make
utils/CMakeFiles/utils.dir/timer.cpp.o
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f utils/CMakeFiles/utils.dir/build.make utils/CMakeFiles/utils.dir/timer.cpp.o
.PHONY : timer.cpp.o
timer.i: timer.cpp.i
@@ -143,7 +143,7 @@ timer.i: timer.cpp.i
# target to preprocess a source file
timer.cpp.i:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f utils/CMakeFiles/utils.dir/build.make
utils/CMakeFiles/utils.dir/timer.cpp.i
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f utils/CMakeFiles/utils.dir/build.make utils/CMakeFiles/utils.dir/timer.cpp.i
.PHONY : timer.cpp.i
timer.s: timer.cpp.s
@@ -151,7 +151,7 @@ timer.s: timer.cpp.s
# target to generate assembly for a file
timer.cpp.s:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(MAKE) $(MAKESILENT) -f utils/CMakeFiles/utils.dir/build.make
utils/CMakeFiles/utils.dir/timer.cpp.s
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(MAKE) $(MAKESILENT)
-f utils/CMakeFiles/utils.dir/build.make utils/CMakeFiles/utils.dir/timer.cpp.s
.PHONY : timer.cpp.s
# Help Target
@@ -177,6 +177,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd
/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build &&
$(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
--check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/cash2ecash/Documents/cash2ecash/build && $(CMAKE_COMMAND)
-S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system
CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/src/cash2ecash.cpp b/src/cash2ecash.cpp
index 03cf69b..d62dda5 100644
--- a/src/cash2ecash.cpp
+++ b/src/cash2ecash.cpp
@@ -29,6 +29,7 @@ int main(int argc, char *argv[]){
case INIT:
state = ACCEPTCASH;
timer1.start();
+ cashacceptor.startMoneyAcceptance();
break;
case SLEEP:
break;
@@ -37,7 +38,6 @@ int main(int argc, char *argv[]){
case CONNECTION:
break;
case ACCEPTCASH:
- cashacceptor.startMoneyAcceptance();
if (timer1.over()) {
cashacceptor.stopMoneyAcceptance();
cashacceptor.readAccumulated(&testamount);
@@ -46,8 +46,9 @@ int main(int argc, char *argv[]){
free(string);
cashacceptor.readFIFO(&testamount);
string = TALER_amount_to_string(&testamount);
- printf("%s", string);
-
+ printf("b%s\n", string);
+ free(string);
+ state = DONE;
}
break;
diff --git a/src/cashacceptor/dg600f.cpp b/src/cashacceptor/dg600f.cpp
index 3e5ddd3..475b888 100644
--- a/src/cashacceptor/dg600f.cpp
+++ b/src/cashacceptor/dg600f.cpp
@@ -48,10 +48,11 @@ int DG600F::clearAccumulatedAmount() {
}
void DG600F::serialListenThread(int fd){
- while (true == flagSerialListenRun) {
int readbytes = 0;
char buffer[32];
TALER_Amount tempAmount;
+ int i;
+while (true == flagSerialListenRun) {
readbytes = read(fd, buffer, 32);
if(0 > readbytes){
std::cerr << "Error Reading from serial Interface" <<
strerror(readbytes) << std::endl;
@@ -59,10 +60,11 @@ void DG600F::serialListenThread(int fd){
}
fifo_mutex.lock();
accumulatedAmount_mutex.lock();
- for (int i=0; i < readbytes; i++) {
+ for (i=0; i < readbytes; i++) {
tempAmount = convertAmount(buffer[i]);
amountFIFO.push_back(tempAmount);
//TODO Errorhandling
+ strcpy(accumulatedAmmount.currency, currency);
TALER_amount_add(&accumulatedAmmount, &accumulatedAmmount, &tempAmount);
}
fifo_mutex.unlock();
@@ -94,8 +96,9 @@ int DG600F::startMoneyAcceptance(){
//TODO stop Inhibiting
//Start thread which waits for chars...
flagSerialListenRun = true;
- std::thread tr(&DG600F::serialListenThread, this, fd);
- return 0;
+ std::thread tr(&DG600F::serialListenThread, this, this->fd);
+ tr.detach();
+return 0;
}
int DG600F::stopMoneyAcceptance(){
@@ -113,8 +116,10 @@ int DG600F::readAccumulated(TALER_Amount *retval) {
int DG600F::readFIFO(TALER_Amount *retval){
fifo_mutex.lock();
+ if (not amountFIFO.empty()){
*retval = *amountFIFO.begin();
- amountFIFO.erase(amountFIFO.begin());
+ amountFIFO.erase(amountFIFO.begin());
+ }
fifo_mutex.unlock();
return 0;
}
@@ -149,6 +154,7 @@ TALER_Amount DG600F::convertAmount(char amount){
talAmount.value = 5;
break;
default:
+ std::cerr << "Received char" << amount << std::endl;
std::cerr << "Unknown Coin value, returning amount 0..." << std::endl;
talAmount.fraction = 0;
talAmount.value = 0;
diff --git a/src/cashacceptor/dg600f.hpp b/src/cashacceptor/dg600f.hpp
index d78389d..cf7b98b 100644
--- a/src/cashacceptor/dg600f.hpp
+++ b/src/cashacceptor/dg600f.hpp
@@ -29,7 +29,7 @@
class DG600F : public Cashaccepor {
private:
char *portPath;
- char *currency;
+ char currency[12] = "KUDOS";
int fd;
volatile bool flagSerialListenRun = false;
std::mutex fifo_mutex, accumulatedAmount_mutex;
diff --git a/src/utils/timer.hpp b/src/utils/timer.hpp
index 45ab4f4..a00ab3b 100644
--- a/src/utils/timer.hpp
+++ b/src/utils/timer.hpp
@@ -17,6 +17,6 @@ class Timer{
}
bool over(){
- return duration_ms >= (std::chrono::steady_clock::now() - timepoint);
+ return duration_ms <= (std::chrono::steady_clock::now() - timepoint);
}
};
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [cash2ecash] branch master updated: some bugfixes,
gnunet <=