diff --git a/doorlockd/CMakeLists.txt b/doorlockd/CMakeLists.txt index 2a166a2..eea68c5 100644 --- a/doorlockd/CMakeLists.txt +++ b/doorlockd/CMakeLists.txt @@ -98,10 +98,10 @@ target_include_directories(doorlock-client PRIVATE ${CMAKE_SOURCE_DIR}) install(TARGETS doorlockd DESTINATION sbin/) install(TARGETS doorlock-client DESTINATION bin/) -install(FILES img/template.png DESTINATION share/doorlockd/) -install(DIRECTORY scripts/ DESTINATION share/doorlockd/ - FILES_MATCHING PATTERN "scripts/doorlockd-*" - PERMISSIONS WORLD_EXECUTE WORLD_READ OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE OWNER_WRITE) +install(DIRECTORY images/ DESTINATION share/doorlockd/images + FILES_MATCHING PATTERN "images/*.png" + PERMISSIONS WORLD_READ OWNER_READ GROUP_READ) + install(FILES scripts/doorlockd.service DESTINATION /etc/systemd/system/) install(DIRECTORY scripts/ DESTINATION etc/doorlockd/ diff --git a/doorlockd/config.h.in b/doorlockd/config.h.in index fd2bb7a..eeecec3 100644 --- a/doorlockd/config.h.in +++ b/doorlockd/config.h.in @@ -26,7 +26,7 @@ #define DEFAULT_SERIAL_DEVICE "/dev/ttyAMA0" #define DEFAULT_SERIAL_BAUDRATE 9600UL -#define TEMPLATE_LOCATION "@CMAKE_INSTALL_PREFIX@/share/doorlockd/template.png" +#define IMAGE_LOCATION "@CMAKE_INSTALL_PREFIX@/share/doorlockd/images/" #define PRE_LOCK_SCRIPT "@CMAKE_INSTALL_PREFIX@/etc/doorlockd/pre_lock &" #define POST_LOCK_SCRIPT "@CMAKE_INSTALL_PREFIX@/etc/doorlockd/post_lock &" diff --git a/doorlockd/images/led-green-off.png b/doorlockd/images/led-green-off.png new file mode 100644 index 0000000..95b0ea1 Binary files /dev/null and b/doorlockd/images/led-green-off.png differ diff --git a/doorlockd/images/led-green-on.png b/doorlockd/images/led-green-on.png new file mode 100644 index 0000000..9f2984b Binary files /dev/null and b/doorlockd/images/led-green-on.png differ diff --git a/doorlockd/images/led-red-off.png b/doorlockd/images/led-red-off.png new file mode 100644 index 0000000..9a2368c Binary files /dev/null and b/doorlockd/images/led-red-off.png differ diff --git a/doorlockd/images/led-red-on.png b/doorlockd/images/led-red-on.png new file mode 100644 index 0000000..ac44099 Binary files /dev/null and b/doorlockd/images/led-red-on.png differ diff --git a/doorlockd/img/template.png b/doorlockd/img/template.png deleted file mode 100644 index 923056a..0000000 Binary files a/doorlockd/img/template.png and /dev/null differ