Merge branch 'master' of github.com:keshuaixu/dractweak

keshuaixu · Apr 17, 2023 · 412670f · 412670f
2 parents d62795f + df10b80
commit 412670f
Show file tree

Hide file tree

Showing 3 changed files with 481 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,5 +55,12 @@ target_sources(dractest PUBLIC ${COMMON_FILES})
 target_link_libraries(dractest Amp1394  OpenGL::GL OpenGL::GLU glfw GLEW::GLEW ${CMAKE_DL_LIBS})
 set_property(TARGET dractest PROPERTY CXX_STANDARD 20)
 
+add_executable(dractune dractune.cpp)
+target_sources(dractune PUBLIC ${COMMON_FILES})
+target_link_libraries(dractune Amp1394  OpenGL::GL OpenGL::GLU glfw GLEW::GLEW ${CMAKE_DL_LIBS})
+set_property(TARGET dractune PROPERTY CXX_STANDARD 20)
+
+
 install(TARGETS dractweak DESTINATION bin)
-install(TARGETS dractest DESTINATION bin)
+install(TARGETS dractest DESTINATION bin)
+install(TARGETS dractune DESTINATION bin)
diff --git a/dractest.cpp b/dractest.cpp
@@ -347,7 +347,7 @@ void test_all() {
         const std::lock_guard<std::mutex> lock(port_mutex);
         board->SetPowerEnable(1);
     }
-    sleep(500);
+    sleep(1000);
     test_48v();
     // test_safety_chain();
     test_adc_zero();
@@ -572,6 +572,7 @@ int main(int, char**)
             std::string portDescription = ethfw ? "udp" : "fw";
             std::stringstream().swap(ss_console);
             Port = PortFactory(portDescription.c_str(), ss_console);
+	    sleep(500, false);
             if (Port && Port->IsOK()) {
                 board = new AmpIO(board_id);
                 Port->AddBoard(board);
@@ -931,4 +932,4 @@ int main(int, char**)
     glfwTerminate();
 
     return 0;
-}
+}