From 514ec386220b5b3c83baf1d273e34f187b86151a Mon Sep 17 00:00:00 2001 From: Clemens Elflein Date: Sun, 28 Nov 2021 02:09:40 +0100 Subject: [PATCH] Fixed CMakeLists.txt. Should fix #22 and #14 --- CMakeLists.txt | 1 + README.md | 11 +++++++---- settings/dev.json | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57cd6f4..df63103 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,3 +92,4 @@ add_custom_target(WITH_APP /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/deploy_app.sh ${C add_custom_target(PACK /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/pack.sh ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) add_dependencies(PACK self_o_mat.app) +add_dependencies(self_o_mat.app WITH_APP) \ No newline at end of file diff --git a/README.md b/README.md index 229ce30..6b4ad95 100644 --- a/README.md +++ b/README.md @@ -72,13 +72,16 @@ cmake .. make ``` -4. Edit settings.json to match your setup +4. Tell your system which type of self-o-mat you are running. For development config use 'dev' by running: + ``sudo bash -c 'echo "dev" > /opt/.selfomat.type'`` -5. Run self-o-mat +5. Edit settings/dev.json to match your setup. It should work with an Arduino Nano by default. + +6. Run the self-o-mat photo-booth software: ``` #setup your installation -cd -build/self_o_mat +cd /build +./self_o_mat.app ``` # Now what? diff --git a/settings/dev.json b/settings/dev.json index 5091f1d..53440b9 100644 --- a/settings/dev.json +++ b/settings/dev.json @@ -1,7 +1,7 @@ { "camera_type": "gphoto", "has_flash": false, - "has_button": false, + "has_button": true, "disable_watchdog": false, "debug": false, "button_port_name": "/dev/ttyUSB",