summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjunkyu han <junkyu.han@samsung.com>2018-06-07 15:40:14 +0900
committerjunkyu han <junkyu.han@samsung.com>2018-06-08 11:07:01 +0900
commit3e32c47e5431904be300829467f06551cdaf97dc (patch)
tree6811c02040566877b6fcfe3c5b61eb25f34086f3
parent5009f76b004d09d876f80442576e812d9395af62 (diff)
downloadrcc-3e32c47e5431904be300829467f06551cdaf97dc.tar.gz
rcc-3e32c47e5431904be300829467f06551cdaf97dc.tar.bz2
rcc-3e32c47e5431904be300829467f06551cdaf97dc.zip
Make exception folder for resources like camera
Change-Id: Ic44031383631d2978e5eed41e20ef5ae32f7fdd9
-rwxr-xr-xCMakeLists.txt1
-rw-r--r--exception/README.md16
-rw-r--r--exception/resource_camera.c (renamed from src/resource/resource_camera.c)0
-rw-r--r--exception/resource_camera.h (renamed from inc/resource/resource_camera.h)0
-rwxr-xr-xinc/resource.h1
-rw-r--r--src/controller.c53
6 files changed, 16 insertions, 55 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49fd759..f2823da 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,6 @@ ADD_EXECUTABLE(${PROJECT_NAME}
${PROJECT_ROOT_DIR}/src/resource/resource_gas_detection_sensor.c
${PROJECT_ROOT_DIR}/src/resource/resource_sound_level_sensor.c
${PROJECT_ROOT_DIR}/src/resource/resource_adc_mcp3008.c
- ${PROJECT_ROOT_DIR}/src/resource/resource_camera.c
)
TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} -lm)
diff --git a/exception/README.md b/exception/README.md
new file mode 100644
index 0000000..ad98e27
--- /dev/null
+++ b/exception/README.md
@@ -0,0 +1,16 @@
+Resources in this 'exception' folder need extra modules.
+
+
+You should follow the sequence like below to use these resource codes.
+
+First, Go to the craftroom to make custom platform image.(https://craftroom.tizen.org)
+ And add certain module what you want to use to the basic platform image.
+
+Second, move resource C file you want to use to src/resource/ folder
+ move resource h file matched with above C file to inc/resource/ folder
+
+Third, add module name to spec file and CMake file.
+#example) in spec file - BuildRequires: pkgconfig(capi-media-camera)
+# in CMake file - capi-media-camera
+
+Fourth, include header file to the resource.h file.
diff --git a/src/resource/resource_camera.c b/exception/resource_camera.c
index e3e4043..e3e4043 100644
--- a/src/resource/resource_camera.c
+++ b/exception/resource_camera.c
diff --git a/inc/resource/resource_camera.h b/exception/resource_camera.h
index c8cd915..c8cd915 100644
--- a/inc/resource/resource_camera.h
+++ b/exception/resource_camera.h
diff --git a/inc/resource.h b/inc/resource.h
index 473a6e8..90c1d28 100755
--- a/inc/resource.h
+++ b/inc/resource.h
@@ -38,6 +38,5 @@
#include "resource/resource_tilt_sensor.h"
#include "resource/resource_gas_detection_sensor.h"
#include "resource/resource_sound_level_sensor.h"
-#include "resource/resource_camera.h"
#endif /* __POSITION_FINDER_RESOURCE_H__ */
diff --git a/src/controller.c b/src/controller.c
index ceef773..6744fb1 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -34,69 +34,16 @@
#define CONNECTIVITY_KEY "opened"
#define SENSORING_TIME_INTERVAL 5.0f
-#define CAMERA_TIME_INTERVAL 2
-#define TEST_CAMERA_SAVE 0
-#define CAMERA_ENABLED 1
typedef struct app_data_s {
Ecore_Timer *getter_timer;
connectivity_resource_s *resource_info;
} app_data;
-static void __resource_camera_capture_completed_cb(const void *image, unsigned int size, void *user_data)
-{
- /* TODO */
- const char *path = NULL;
- const char *url = NULL;
-
- controller_util_get_path(&path);
-
- controller_util_get_image_address(&url);
-
- web_util_noti_post_image_data(url, path, image, size);
-
-#if TEST_CAMERA_SAVE
- FILE *fp = NULL;
- char *data_path = NULL;
- char file[256];
-
- data_path = app_get_data_path();
-
- snprintf(file, sizeof(file), "%sjjoggoba.jpg", data_path);
- free(data_path);
- _D("File : %s", file);
-
- fp = fopen(file, "w");
- if (!fp) {
- _E("Failed to open file: %s", file);
- return;
- }
-
- if (fwrite(image, size, 1, fp) != 1) {
- _E("Failed to write image to file");
- return;
- }
-
- fclose(fp);
-#endif
-}
-
static Eina_Bool control_sensors_cb(void *data)
{
app_data *ad = data;
int value = 1;
- int ret = 0;
-#if CAMERA_ENABLED
- static unsigned int count = 0;
-
- if (count % CAMERA_TIME_INTERVAL == 0) {
- ret = resource_capture_camera(__resource_camera_capture_completed_cb, NULL);
- if (ret < 0)
- _E("Failed to capture camera");
- }
-
- count++;
-#endif
/* This is example, get value from sensors first */
if (connectivity_notify_int(ad->resource_info, "Motion", value) == -1)