Skip to content

Commit 514ec38

Browse files
Fixed CMakeLists.txt. Should fix #22 and #14
1 parent 7312ead commit 514ec38

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,4 @@ add_custom_target(WITH_APP /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/deploy_app.sh ${C
9292
add_custom_target(PACK /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/pack.sh ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
9393

9494
add_dependencies(PACK self_o_mat.app)
95+
add_dependencies(self_o_mat.app WITH_APP)

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,16 @@ cmake ..
7272
make
7373
```
7474

75-
4. Edit settings.json to match your setup
75+
4. Tell your system which type of self-o-mat you are running. For development config use 'dev' by running:
76+
``sudo bash -c 'echo "dev" > /opt/.selfomat.type'``
7677

77-
5. Run self-o-mat
78+
5. Edit settings/dev.json to match your setup. It should work with an Arduino Nano by default.
79+
80+
6. Run the self-o-mat photo-booth software:
7881
```
7982
#setup your installation
80-
cd <source dir>
81-
build/self_o_mat
83+
cd <source dir>/build
84+
./self_o_mat.app
8285
```
8386

8487
# Now what?

settings/dev.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"camera_type": "gphoto",
33
"has_flash": false,
4-
"has_button": false,
4+
"has_button": true,
55
"disable_watchdog": false,
66
"debug": false,
77
"button_port_name": "/dev/ttyUSB",

0 commit comments

Comments
 (0)