commit 5e26ac4a6a1f617a2d6e7c2eab3330ed794a14b0
parent fa8320f44288d5d441a33d771de133d7485bdb05
Author: Manuel Geissbühler <manuel@debian>
Date: Mon, 30 Dec 2024 14:54:04 +0100
debugging
Diffstat:
3 files changed, 107 insertions(+), 8 deletions(-)
diff --git a/build/compile_commands.json b/build/compile_commands.json
@@ -3905,6 +3905,21 @@
"file": "/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/gui/screenWelcome.cpp"
},
{
+ "directory": "/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/gui",
+ "command": "/usr/bin/c++ -DLV_CONF_INCLUDE_SIMPLE -DLV_LVGL_H_INCLUDE_SIMPLE -I/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/include -I/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern -I/usr/include/libdrm -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/extern/lvgl -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl/examples -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl/demos -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl/src/libs/thorvg -g -o CMakeFiles/gui.dir/screenIdentification.cpp.o -c /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/gui/screenIdentification.cpp",
+ "file": "/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/gui/screenIdentification.cpp"
+},
+{
+ "directory": "/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/gui",
+ "command": "/usr/bin/c++ -DLV_CONF_INCLUDE_SIMPLE -DLV_LVGL_H_INCLUDE_SIMPLE -I/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/include -I/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern -I/usr/include/libdrm -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/extern/lvgl -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl/examples -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl/demos -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl/src/libs/thorvg -g -o CMakeFiles/gui.dir/screenConnection.cpp.o -c /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/gui/screenConnection.cpp",
+ "file": "/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/gui/screenConnection.cpp"
+},
+{
+ "directory": "/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/gui",
+ "command": "/usr/bin/c++ -DLV_CONF_INCLUDE_SIMPLE -DLV_LVGL_H_INCLUDE_SIMPLE -I/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/include -I/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern -I/usr/include/libdrm -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build/extern/lvgl -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl/examples -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl/demos -isystem /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/extern/lvgl/src/libs/thorvg -g -o CMakeFiles/gui.dir/screenAcceptCash.cpp.o -c /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/gui/screenAcceptCash.cpp",
+ "file": "/home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/src/gui/screenAcceptCash.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"
diff --git a/build/gui/Makefile b/build/gui/Makefile
@@ -223,6 +223,78 @@ screen.cpp.s:
cd /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build && $(MAKE) $(MAKESILENT) -f gui/CMakeFiles/gui.dir/build.make gui/CMakeFiles/gui.dir/screen.cpp.s
.PHONY : screen.cpp.s
+screenAcceptCash.o: screenAcceptCash.cpp.o
+.PHONY : screenAcceptCash.o
+
+# target to build an object file
+screenAcceptCash.cpp.o:
+ cd /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build && $(MAKE) $(MAKESILENT) -f gui/CMakeFiles/gui.dir/build.make gui/CMakeFiles/gui.dir/screenAcceptCash.cpp.o
+.PHONY : screenAcceptCash.cpp.o
+
+screenAcceptCash.i: screenAcceptCash.cpp.i
+.PHONY : screenAcceptCash.i
+
+# target to preprocess a source file
+screenAcceptCash.cpp.i:
+ cd /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build && $(MAKE) $(MAKESILENT) -f gui/CMakeFiles/gui.dir/build.make gui/CMakeFiles/gui.dir/screenAcceptCash.cpp.i
+.PHONY : screenAcceptCash.cpp.i
+
+screenAcceptCash.s: screenAcceptCash.cpp.s
+.PHONY : screenAcceptCash.s
+
+# target to generate assembly for a file
+screenAcceptCash.cpp.s:
+ cd /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build && $(MAKE) $(MAKESILENT) -f gui/CMakeFiles/gui.dir/build.make gui/CMakeFiles/gui.dir/screenAcceptCash.cpp.s
+.PHONY : screenAcceptCash.cpp.s
+
+screenConnection.o: screenConnection.cpp.o
+.PHONY : screenConnection.o
+
+# target to build an object file
+screenConnection.cpp.o:
+ cd /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build && $(MAKE) $(MAKESILENT) -f gui/CMakeFiles/gui.dir/build.make gui/CMakeFiles/gui.dir/screenConnection.cpp.o
+.PHONY : screenConnection.cpp.o
+
+screenConnection.i: screenConnection.cpp.i
+.PHONY : screenConnection.i
+
+# target to preprocess a source file
+screenConnection.cpp.i:
+ cd /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build && $(MAKE) $(MAKESILENT) -f gui/CMakeFiles/gui.dir/build.make gui/CMakeFiles/gui.dir/screenConnection.cpp.i
+.PHONY : screenConnection.cpp.i
+
+screenConnection.s: screenConnection.cpp.s
+.PHONY : screenConnection.s
+
+# target to generate assembly for a file
+screenConnection.cpp.s:
+ cd /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build && $(MAKE) $(MAKESILENT) -f gui/CMakeFiles/gui.dir/build.make gui/CMakeFiles/gui.dir/screenConnection.cpp.s
+.PHONY : screenConnection.cpp.s
+
+screenIdentification.o: screenIdentification.cpp.o
+.PHONY : screenIdentification.o
+
+# target to build an object file
+screenIdentification.cpp.o:
+ cd /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build && $(MAKE) $(MAKESILENT) -f gui/CMakeFiles/gui.dir/build.make gui/CMakeFiles/gui.dir/screenIdentification.cpp.o
+.PHONY : screenIdentification.cpp.o
+
+screenIdentification.i: screenIdentification.cpp.i
+.PHONY : screenIdentification.i
+
+# target to preprocess a source file
+screenIdentification.cpp.i:
+ cd /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build && $(MAKE) $(MAKESILENT) -f gui/CMakeFiles/gui.dir/build.make gui/CMakeFiles/gui.dir/screenIdentification.cpp.i
+.PHONY : screenIdentification.cpp.i
+
+screenIdentification.s: screenIdentification.cpp.s
+.PHONY : screenIdentification.s
+
+# target to generate assembly for a file
+screenIdentification.cpp.s:
+ cd /home/manuel/Dokumente/Studium/BTE5512_Projektarbeit/cash2ecash/build && $(MAKE) $(MAKESILENT) -f gui/CMakeFiles/gui.dir/build.make gui/CMakeFiles/gui.dir/screenIdentification.cpp.s
+.PHONY : screenIdentification.cpp.s
+
screenWelcome.o: screenWelcome.cpp.o
.PHONY : screenWelcome.o
@@ -266,6 +338,15 @@ help:
@echo "... screen.o"
@echo "... screen.i"
@echo "... screen.s"
+ @echo "... screenAcceptCash.o"
+ @echo "... screenAcceptCash.i"
+ @echo "... screenAcceptCash.s"
+ @echo "... screenConnection.o"
+ @echo "... screenConnection.i"
+ @echo "... screenConnection.s"
+ @echo "... screenIdentification.o"
+ @echo "... screenIdentification.i"
+ @echo "... screenIdentification.s"
@echo "... screenWelcome.o"
@echo "... screenWelcome.i"
@echo "... screenWelcome.s"
diff --git a/src/cash2ecash.cpp b/src/cash2ecash.cpp
@@ -35,10 +35,11 @@ char hello[] = "hello";
char world[] = "wold";
char *string = hello;
Gui gui;
-Screen *screenWelcome = new ScreenWelcome();
-//Screen screenIdentification = ScreenIdentification();
-//Screen screenConnection = ScreenConnection();
-//Screen screenAcceptCash = ScreenAcceptCash(string);
+
+ScreenWelcome *screenWelcome = new ScreenWelcome;
+ScreenIdentification *screenIdentification = new ScreenIdentification;
+ScreenConnection *screenConnection = new ScreenConnection;
+ScreenAcceptCash *screenAcceptCash = new ScreenAcceptCash(string);
void guiDriver();
typedef void(*action_t)();
@@ -63,7 +64,7 @@ void actionEventUnexpected(){
void actionEventStart(){
std::cout << "Action Event Start called" << std::endl;
- //gui.setActiveScreen(&screenIdentification);
+ gui.setActiveScreen(screenIdentification);
}
void actionEventAbortIdent(){
@@ -87,7 +88,7 @@ void actionEventWakeup() { std::cout << "Action Event xx called" << std::endl; }
void actionEventIdentificationSuccess(){
std::cout << "Action Event xx called" << std::endl;
- //gui.setActiveScreen(&screenConnection);
+ gui.setActiveScreen(screenConnection);
}
void actionEventBankTokenDone(){
@@ -100,7 +101,7 @@ void actionEventBankWithdrawalDone(){
void actionEventBankWStatusConfirmed(){
std::cout << "Action Event Bank Withdrawal Status Confirmed called" << std::endl;
- //gui.setActiveScreen(&screenAcceptCash);
+ gui.setActiveScreen(screenAcceptCash);
}
void actionEventBankWStatusPending(){
@@ -198,13 +199,15 @@ int main(int argc, char *argv[]){
Timer timer1;
timer1.setTimeMillis(10000);
TALER_Amount testamount;
-
//Initialize State Machine
initStateEvent();
//Trigger Initialzation Event
eventHandler(EVENT_INITIALIZE);
+
+
+
while (true) {
guiDriver();
