fpga prog

eez-open · Nov 19, 2020 · 4c44656 · 4c44656
1 parent 705cc6d
commit 4c44656
Show file tree

Hide file tree

Showing 14 changed files with 588 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -417,6 +417,16 @@ set(header_eez_modules_bp3c
 list (APPEND header_files ${header_eez_modules_bp3c})
 source_group("eez\\modules\\bp3c" FILES ${src_eez_modules_bp3c} ${header_eez_modules_bp3c})
 
+set(src_eez_modules_fpga
+    src/eez/modules/fpga/prog.cpp
+) 
+list (APPEND src_files ${src_eez_modules_fpga})
+set(header_eez_modules_fpga
+    src/eez/modules/fpga/prog.h
+) 
+list (APPEND header_files ${header_eez_modules_fpga})
+source_group("eez\\modules\\fpga" FILES ${src_eez_modules_fpga} ${header_eez_modules_fpga})
+
 set(src_eez_modules_mcu
     src/eez/modules/mcu/battery.cpp
     src/eez/modules/mcu/display.cpp

diff --git a/src/eez/gui/app_context.cpp b/src/eez/gui/app_context.cpp
@@ -104,10 +104,10 @@ void AppContext::onPageChanged(int previousPageId, int activePageId) {
 }
 
 void AppContext::doShowPage(int pageId, Page *page, int previousPageId) {
-#if CONF_OPTION_FPGA
-    pageId = PAGE_ID_WELCOME_800X480;
-    page = nullptr;
-#endif
+//#if CONF_OPTION_FPGA
+//    pageId = PAGE_ID_WELCOME_800X480;
+//    page = nullptr;
+//#endif
 
     page = page ? page : getPageFromIdHook(pageId);