Fixed CMakeLists.txt. Should fix #22 and #14

xtech · Nov 28, 2021 · 514ec38 · 514ec38
1 parent 7312ead
commit 514ec38
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git 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)
diff --git 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 <source dir>
-build/self_o_mat
+cd <source dir>/build
+./self_o_mat.app
 ```
 
 # Now what?

diff --git 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",
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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)