diff --git a/.github/workflows/cmake-workflow.yml b/.github/workflows/cmake-workflow.yml index d5d7e770..3a9895f3 100644 --- a/.github/workflows/cmake-workflow.yml +++ b/.github/workflows/cmake-workflow.yml @@ -65,8 +65,8 @@ jobs: # command_exptime=$(cam exptime 1500) # check $command_exptime - command_expose=$(cam expose) - check $command_expose + # command_expose=$(cam expose) + # check $command_expose command_printstatus=$(cam printstatus) check $command_printstatus diff --git a/emulator/CMakeLists.txt b/emulator/CMakeLists.txt index 4745bc26..cfdc4ea4 100644 --- a/emulator/CMakeLists.txt +++ b/emulator/CMakeLists.txt @@ -10,7 +10,7 @@ include_directories( ${PROJECT_BASE_DIR}/utils ${PROJECT_BASE_DIR}/camerad ${PROJECT_BASE_DIR}/common ) -add_definitions( -Wall -ansi -O2 -Wno-variadic-macros -std=c++17 -std=c17 -ggdb ) +add_definitions( -Wall -ansi -O2 -Wno-variadic-macros -std=c++17 -ggdb ) if( ${INTERFACE_TYPE} STREQUAL "Archon" ) add_definitions(-DSTA_ARCHON) diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 699ff8e3..9cf81fa2 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -7,7 +7,7 @@ set(PROJECT_UTILS_DIR ${PROJECT_BASE_DIR}/utils) set( CMAKE_CXX_STANDARD 17 ) -add_definitions( -Wall -ansi -O1 -Wno-variadic-macros -std=c++17 -std=c17 -ggdb ) +add_definitions( -Wall -ansi -O1 -Wno-variadic-macros -std=c++17 -ggdb ) add_library(utilities STATIC ${PROJECT_UTILS_DIR}/utilities.cpp diff --git a/utils/sendcmd.c b/utils/sendcmd.c index 3d52c2ae..9052a873 100644 --- a/utils/sendcmd.c +++ b/utils/sendcmd.c @@ -16,20 +16,19 @@ int main(int argc, char *argv[]) { - int sock, timeout; + int sock, timeout=10; struct timeval tvstart, tvend; int bufsize = 8192; int nread, len; char *message = (char*)malloc(bufsize); char *response = (char*)malloc(bufsize); char *hostname = (char*)malloc (30); - int i, port, mode; struct sockaddr_in address; - struct hostent *host_struct; + struct hostent *host_struct; + int mode = 0; /* 0: wait, 1: not wait*/ - mode = 0; /* 0: wait, 1: not wait*/ - timeout = 10; - i = 1; + int port = 3031; // set default port + int i = 1; if (argc > 1) while (i < argc) { if (argv[i][0] == '-') {