Skip to content
This repository has been archived by the owner on Jun 18, 2022. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Cédric Verstraeten committed Sep 13, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents c04ca3f + 0bba8c0 commit 56f0f73
Showing 31 changed files with 441 additions and 2,305 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -30,4 +30,6 @@
# Build and bin directory
bin/*
build/*
config/*
config/*
ide/*
test/bin/*
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@ compiler:
- gcc

before_install:
- sudo apt-get update
- sudo apt-get install x264 v4l-utils ffmpeg

script:
mkdir build && cd build && cmake .. && make && make check
@@ -21,5 +23,4 @@ notifications:
on_failure: always

os:
- linux
- osx
- linux
1 change: 0 additions & 1 deletion cmake/External-Googletest.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
message("External project: Googletest")

ExternalProject_Add(googletest
#URL https://googletest.googlecode.com/files/gtest-1.7.0.zip
SVN_REPOSITORY http://googletest.googlecode.com/svn/trunk/
SOURCE_DIR googletest
BUILD_IN_SOURCE 1
2 changes: 1 addition & 1 deletion cmake/External-OpenCV.cmake
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ ExternalProject_Add(opencv
-DBUILD_TESTS:BOOL=OFF
-DBUILD_PERF_TESTS:BOOL=OFF
-DCMAKE_BUILD_TYPE:STRING=Release
-DWITH_FFMPEG:BOOL=OFF
-DWITH_FFMPEG:BOOL=ON
-DBUILD_FAT_JAVA_LIB=OFF
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/thirdparty
)
15 changes: 14 additions & 1 deletion cmake/External-RaspiCam.cmake
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# -----------------------------------
# Userland, ARM used by raspicam

message("Bind project: Userland")

set(USERLAND_INCLUDE_DIR /opt/vc/include/)
set(USERLAND_LIBRARY_DIR /opt/vc/lib/)

include_directories(${USERLAND_INCLUDE_DIR})
link_directories(${USERLAND_LIBRARY_DIR})

# -----------------------------------
# Raspicam

message("External project: RaspiCam")

ExternalProject_Add(raspicamera
@@ -10,7 +24,6 @@ ExternalProject_Add(raspicamera
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/thirdparty
)
add_dependencies(raspicamera userland)

set(RASPBERRYPI_INCLUDE_DIR ${CMAKE_BINARY_DIR}/thirdparty/include/)
set(RASPBERRYPI_LIBRARY_DIR ${CMAKE_BINARY_DIR}/thirdparty/lib/)
20 changes: 20 additions & 0 deletions cmake/External-Restclient.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
message("External project: Restclient")

ExternalProject_Add(restclient
GIT_REPOSITORY ${git_protocol}://github.com/mrtazz/restclient-cpp
SOURCE_DIR restclient
BUILD_IN_SOURCE 1
UPDATE_COMMAND ""
PATCH_COMMAND ""
CONFIGURE_COMMAND ./autogen.sh && ./configure
BUILD_COMMAND make && cp .libs/librestclient-cpp.a ../thirdparty/lib/
INSTALL_COMMAND ""
)

set(RESTCLIENT_INCLUDE_DIR ${CMAKE_BINARY_DIR}/restclient/include/)
set(RESTCLIENT_LIBRARY_DIR ${CMAKE_BINARY_DIR}/thirdparty/lib/)

set(RESTCLIENT_LIBRARIES restclient-cpp curl)

include_directories(${RESTCLIENT_INCLUDE_DIR})
link_directories(${RESTCLIENT_LIBRARY_DIR})
7 changes: 0 additions & 7 deletions cmake/External-Userland.cmake

This file was deleted.

15 changes: 7 additions & 8 deletions cmake/Superbuild.cmake
Original file line number Diff line number Diff line change
@@ -33,18 +33,17 @@ include( ExternalProject )

if(${IS_RASPBERRYPI})

# --------------------------------------------------------------------------
# Userland, ARM used by raspicam
#

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/External-Userland.cmake)
set(KERBEROS_DEPENDENCIES ${KERBEROS_DEPENDENCIES} userland)

# --------------------------------------------------------------------------
# RaspiCam
#

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/External-RaspiCam.cmake)
set(KERBEROS_DEPENDENCIES ${KERBEROS_DEPENDENCIES} raspicamera)

endif()
endif()

# --------------------------------------------------------------------------
# Restclient

include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/External-Restclient.cmake)
set(KERBEROS_DEPENDENCIES ${KERBEROS_DEPENDENCIES} restclient)
22 changes: 16 additions & 6 deletions config/capture.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,26 @@
<?xml version="1.0"?>
<captures>

<USBCamera>
<frameWidth type="number">800</frameWidth>
<frameHeight type="number">640</frameHeight>
<IPCamera>
<url type="text">http://username:password@ipaddress/image.jpg</url>
<frameWidth type="number">800</frameWidth>
<frameHeight type="number">640</frameHeight>
<delay type="number">500</delay>
<angle type="number">0</angle>
</IPCamera>

<USBCamera>
<frameWidth type="number">800</frameWidth>
<frameHeight type="number">640</frameHeight>
<delay type="number">500</delay>
<angle type="number">0</angle>
</USBCamera>

<RaspiCamera>
<frameWidth type="number">800</frameWidth>
<frameHeight type="number">640</frameHeight>
<night type="number">0</night>
<day type="number">0</day>
<delay type="number">500</delay>
<angle type="number">0</angle>
</RaspiCamera>

</captures>
3 changes: 1 addition & 2 deletions config/config.xml
Original file line number Diff line number Diff line change
@@ -4,9 +4,8 @@
<!-- Settings for instance -->
<instance>
<name type="text">frontdoor</name>
<timezone file="timezone.xml">Europe-Brussels</timezone>
<timezone type="timezone">Europe-Brussels</timezone>
<capture file="capture.xml">RaspiCamera</capture>
<captureDelayTime type="number">0</captureDelayTime>
<condition file="condition.xml" type="multiple">Enabled</condition>
<algorithm file="algorithm.xml">DifferentialCollins</algorithm>
<expositor file="expositor.xml">Hull</expositor>
3 changes: 3 additions & 0 deletions config/io.xml
100755 → 100644
Original file line number Diff line number Diff line change
@@ -15,5 +15,8 @@
<port type="number">1337</port>
<message type="text">motion detected</message>
</TCPSocket>
<Webhook>
<url type="text">http://kerberos.web/api/v1/webhook</url>
</Webhook>

</ios>
Loading

0 comments on commit 56f0f73

Please sign in to comment.