fix typo in resource_adc_mcp3008.c

[apps/native/position-finder-server.git] / inc / webutil.h

diff --git a/inc/webutil.h b/inc/webutil.h
index 2a40e62..a229e07 100644 (file)
--- a/inc/webutil.h
+++ b/inc/webutil.h
@@ -33,6 +33,14 @@ typedef enum {
        WEB_UTIL_SENSOR_VIB = (1 << 4), /* vibration sensor */
        WEB_UTIL_SENSOR_CO2 = (1 << 5), /* CO2 sensor */
        WEB_UTIL_SENSOR_SOUND = (1 << 6), /* noise sensor */
+       WEB_UTIL_SENSOR_TILT = (1 << 7), /* tilt sensor */
+       WEB_UTIL_SENSOR_LIGHT = (1 << 8), /* light sensor */
+       WEB_UTIL_SENSOR_COLLISION = (1 << 9), /* collision sensor */
+       WEB_UTIL_SENSOR_OBSTACLE = (1 << 10), /* obstacle avoidance sensor */
+       WEB_UTIL_SENSOR_ULTRASONIC_DISTANCE = (1 << 11), /* ultrasonic distance sensor */
+       WEB_UTIL_SENSOR_RAIN = (1 << 12), /* rain sensor */
+       WEB_UTIL_SENSOR_TOUCH = (1 << 13), /* touch sensor */
+       WEB_UTIL_SENSOR_GAS = (1 << 14), /* gas sensor */
 } web_util_sensor_type_e;
 
 typedef struct _web_util_sensor_data_s web_util_sensor_data_s;
@@ -44,19 +52,37 @@ struct _web_util_sensor_data_s {
        int virbration;
        double co2;
        int soundlevel;
+       int tilt;
+       int light;
+       int collision;
+       int obstacle;
+       double distance;
+       int rain;
+       int touch;
+       int gas;
        web_util_sensor_type_e enabled_sensor;
-       char *hash;
+       const char *hash;
+       const char *ip_addr;
 };
 
 int web_util_noti_init(void);
 void web_util_noti_fini(void);
 int web_util_noti_post(const char *resource, const char *json_data);
+int web_util_noti_post_image_data(const char *url, const char *device_id,
+       const void *image_data, unsigned int image_size);
+int web_util_noti_get(const char *resource, char **res);
 
 int web_util_json_init(void);
 int web_util_json_fini(void);
+int web_util_json_begin(void);
+int web_util_json_end(void);
 int web_util_json_data_array_begin(void);
 int web_util_json_data_array_end(void);
+int web_util_json_add_int(const char* key, long long int value);
+int web_util_json_add_double(const char* key, double value);
+int web_util_json_add_boolean(const char* key, bool value);
+int web_util_json_add_string(const char* key, const char *value);
 int web_util_json_add_sensor_data(const char* sensorpi_id, web_util_sensor_data_s *sensor_data);
 char *web_util_get_json_string(void);
 
-#endif /* __POSITION_FINDER_WEBUTIL_H__ */
\ No newline at end of file
+#endif /* __POSITION_FINDER_WEBUTIL_H__ */