change configure load method

11 files changed, 243 insertions, 149 deletions

diff --git a/packaging/sensor-framework.changes b/packaging/sensor-framework.changes
index 171d62d..b980bdb 100644
--- a/packaging/sensor-framework.changes
+++ b/packaging/sensor-framework.changes
@@ -1,4 +1,4 @@
-* Tue Feb 19 2013 Telle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com> accepted/trunk/20130131.000522@e0551a5
+* Tue Feb 19 2013 Telle-Tiia Pitkanen <telle-tiia.pitkanen@ixonos.com> accepted/trunk/20130131.000522@e0551a5
 - PR3 required changes added.
 - Add assign tag in manifest file
 - Add vconf key for no move event
@@ -8,7 +8,7 @@
 - Add vconf key for tilt, panning browse event
 - Add license
 
-* Tue Jan 15 2013 Telle-Tiia Pitkänen <telle-tiia.pitkanen@ixonos.com> submit/tizen_2.0/20130109.005631@b28fbf6
+* Tue Jan 15 2013 Telle-Tiia Pitkanen <telle-tiia.pitkanen@ixonos.com> submit/tizen_2.0/20130109.005631@b28fbf6
 - PR3 required changes added.
 
 - code sync
diff --git a/packaging/sensor-framework.spec b/packaging/sensor-framework.spec
index b3966d1..1ccd698 100644
--- a/packaging/sensor-framework.spec
+++ b/packaging/sensor-framework.spec
@@ -1,10 +1,10 @@
 #sbs-git:slp/pkgs/s/sensor-framework sensor-framework 0.2.5 f585f766aa864c3857e93c776846771899a4fa41
 Name:       sensor-framework
 Summary:    Sensor framework
-Version: 0.2.26
+Version: 0.2.30
 Release:    1
-Group:      TO_BE/FILLED_IN
-License:    Apache 2.0
+Group:      Framework/system
+License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    sensor-framework.service
 
diff --git a/server/include/ccatalog.h b/server/include/ccatalog.h
index 8c7cef2..44ceb16 100755
--- a/server/include/ccatalog.h
+++ b/server/include/ccatalog.h
@@ -43,6 +43,7 @@ public:
 	bool unload(void);
 
 	char *value(char *group, char *name);
+	char *value(void *handle, char *name);
 	char *value(char *group, char *name, int idx);
 	int count_of_values(char *group, char *name);
 
diff --git a/server/src/ccatalog.cpp b/server/src/ccatalog.cpp
index 73a0f10..31be9bc 100755
--- a/server/src/ccatalog.cpp
+++ b/server/src/ccatalog.cpp
@@ -296,6 +296,25 @@ char *ccatalog::value(char *group, char *name)
 	return NULL;
 }
 
+char *ccatalog::value(void *handle, char *name)
+{
+        group_t *grp = (group_t *)handle;
+
+        if (grp) {
+                desc_t *desc;
+                desc = grp->head;
+
+                while (desc) {
+                        if (!strncmp(name, desc->name, sizeof(desc->name))) {
+                                return desc->value;
+                        }
+                        desc = (desc_t*)desc->next();
+                }
+        }
+
+        return NULL;
+}
+
 char *ccatalog::value(char *group, char *name, int idx)
 {
 	group_t *grp;
@@ -351,7 +370,7 @@ int ccatalog::count_of_values(char *group, char *name)
 	}
 	return count;
 }
-									
+
 void *ccatalog::iterate_init(void)
 {
 	return (void*)m_head;
diff --git a/server/src/cfilter_catalog.cpp b/server/src/cfilter_catalog.cpp
index 0da174b..af3179f 100755
--- a/server/src/cfilter_catalog.cpp
+++ b/server/src/cfilter_catalog.cpp
@@ -84,31 +84,34 @@ bool cfilter_catalog::create(char *file)
 	handle = ccatalog::iterate_init();
 	while (handle) {
 		name = ccatalog::iterate_get_name(handle);
-		handle = ccatalog::iterate_next(handle);
 		if (!name) {
 			ERR("Name is null\n");
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
 
-		value = ccatalog::value(name, (char*)STR_DISABLE);
+		value = ccatalog::value(handle, (char*)STR_DISABLE);
 		if (value && !strcasecmp(value, STR_YES)) {
 			ERR("%s is disabled\n", name);
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
 
-		value = ccatalog::value(name, (char*)STR_PATH);
+		value = ccatalog::value(handle, (char*)STR_PATH);
 		if (!value) {
 			ERR("Module path is not defined\n");
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
 
 		module = cfilter_module::register_module(value, NULL, NULL);
 		if (!module) {
 			ERR("Failed to register a module %s\n", name);
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
 
-		value = ccatalog::value(name, (char*)STR_OVERRIDE);
+		value = ccatalog::value(handle, (char*)STR_OVERRIDE);
 		if (value && !strcasecmp(value, STR_YES)) {
 			DBG("Let's override module description\n");
 
@@ -116,20 +119,21 @@ bool cfilter_catalog::create(char *file)
 				ERR("Failed to update module name\n");
 			}
 
-			value = ccatalog::value(name, (char*)STR_ID);
+			value = ccatalog::value(handle, (char*)STR_ID);
 			if (value) {
 				if (module->update_id(atoi(value)) == false) {
 					ERR("Failed to update ID\n");
 				}
 			}
 
-			value = ccatalog::value(name, (char*)STR_VERSION);
+			value = ccatalog::value(handle, (char*)STR_VERSION);
 			if (value) {
 				if (module->update_version(atoi(value)) == false) {
 					ERR("Failed to update version\n");
 				}
 			}
 		}
+		handle = ccatalog::iterate_next(handle);
 	}
 
 	DBG("Finished registeration , unload filter.conf ");
diff --git a/server/src/cprocessor_catalog.cpp b/server/src/cprocessor_catalog.cpp
index f16c507..51fea89 100755
--- a/server/src/cprocessor_catalog.cpp
+++ b/server/src/cprocessor_catalog.cpp
@@ -85,31 +85,33 @@ bool cprocessor_catalog::create(char *file)
 	handle = ccatalog::iterate_init();
 	while (handle) {
 		name = ccatalog::iterate_get_name(handle);
-		handle = ccatalog::iterate_next(handle);
 		if (!name) {
 			ERR("Name is null\n");
 			continue;
 		}
 
-		value = ccatalog::value(name, (char*)STR_DISABLE);
+		value = ccatalog::value(handle, (char*)STR_DISABLE);
 		if (value && !strcasecmp(value, STR_YES)) {
 			ERR("%s is disabled\n", name);
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
 
-		value = ccatalog::value(name, (char*)STR_PATH);
+		value = ccatalog::value(handle, (char*)STR_PATH);
 		if (!value) {
 			ERR("Module path is not defined\n");
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
 
 		module = cprocessor_module::register_module(value, NULL, NULL);
 		if (!module) {
 			ERR("Failed to register a module %s\n", name);
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
 
-		value = ccatalog::value(name, (char*)STR_OVERRIDE);
+		value = ccatalog::value(handle, (char*)STR_OVERRIDE);
 		if (value && !strcasecmp(value, STR_YES)) {
 			DBG("Let's override module description\n");
 
@@ -117,20 +119,21 @@ bool cprocessor_catalog::create(char *file)
 				ERR("Failed to update module name\n");
 			}
 
-			value = ccatalog::value(name, (char*)STR_ID);
+			value = ccatalog::value(handle, (char*)STR_ID);
 			if (value) {
 				if (module->update_id(atoi(value)) == false) {
 					ERR("Failed to update ID\n");
 				}
 			}
 
-			value = ccatalog::value(name, (char*)STR_VERSION);
+			value = ccatalog::value(handle, (char*)STR_VERSION);
 			if (value) {
 				if (module->update_version(atoi(value)) == false) {
 					ERR("Failed to update version\n");
 				}
 			}
 		}
+		handle = ccatalog::iterate_next(handle);
 	}
 
 	DBG("Finished registeration , unload processor.conf ");
diff --git a/server/src/csensor_catalog.cpp b/server/src/csensor_catalog.cpp
index e162041..51efb06 100755
--- a/server/src/csensor_catalog.cpp
+++ b/server/src/csensor_catalog.cpp
@@ -89,31 +89,37 @@ bool csensor_catalog::create(char *file)
 	handle = ccatalog::iterate_init();
 	while (handle) {
 		name = ccatalog::iterate_get_name(handle);
-		handle = ccatalog::iterate_next(handle);
+		DBG("ccatalog name = [%s]",name);
 		if (!name) {
 			ERR("Name is null\n");
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
 
-		value = ccatalog::value(name, (char*)STR_DISABLE);
+		value = ccatalog::value(handle, (char*)STR_DISABLE);
 		if (value && !strcasecmp(value, STR_YES)) {
 			ERR("%s is disabled\n", name);
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
 
-		value = ccatalog::value(name, (char*)STR_PATH);
+		value = ccatalog::value(handle, (char*)STR_PATH);
 		if (!value) {
 			ERR("Module path is not defined\n");
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
 
+		DBG("file path = [%s]",value);
 		module = csensor_module::register_module(value, NULL, NULL);
 		if (!module) {
 			ERR("Failed to register a module %s\n", name);
+			handle = ccatalog::iterate_next(handle);
 			continue;
 		}
+		DBG("file path = [%s] registered",value);
 
-		value = ccatalog::value(name, (char*)STR_OVERRIDE);
+		value = ccatalog::value(handle, (char*)STR_OVERRIDE);
 		if (value && !strcasecmp(value, STR_YES)) {
 			DBG("Let's override module description [%s]\n", name);
 
@@ -121,21 +127,21 @@ bool csensor_catalog::create(char *file)
 				ERR("Failed to update module name\n");
 			}
 
-			value = ccatalog::value(name, (char*)STR_ID);
+			value = ccatalog::value(handle, (char*)STR_ID);
 			if (value) {
 				if (module->update_id(atoi(value)) == false) {
 					ERR("Failed to update ID\n");
 				}
 			}
 
-			value = ccatalog::value(name, (char*)STR_VERSION);
+			value = ccatalog::value(handle, (char*)STR_VERSION);
 			if (value) {
 				if (module->update_version(atoi(value)) == false) {
 					ERR("Failed to update version\n");
 				}
 			}
 
-			value = ccatalog::value(name, (char*)STR_POLL);
+			value = ccatalog::value(handle, (char*)STR_POLL);
 			if (value) {
 				csensor_module *sensor;
 				sensor = (csensor_module*)module;
@@ -144,6 +150,7 @@ bool csensor_catalog::create(char *file)
 				}
 			}
 		}
+		handle = ccatalog::iterate_next(handle);
 	}
 
 	DBG("Finished registeration , unload sensor.conf ");
diff --git a/sf_data_stream.conf.in b/sf_data_stream.conf.in
index 816c34c..e506c39 100755
--- a/sf_data_stream.conf.in
+++ b/sf_data_stream.conf.in
@@ -1,64 +1,34 @@
 [accel_datastream]
-multi_stream=disable
-filter_input=bma023_filter, bma023_filter, bma023_sensor
-processor_input=bma023_processor, bma023_processor, bma023_filter
-processor_input=bma250_processor, bma250_processor, bma250_sensor
-processor_input=bma254_processor, bma254_processor, bma254_sensor
-processor_input=kr3dm_processor, kr3dm_processor, kr3dm_sensor
-processor_input=lsm330dlc_accel_processor, lsm330dlc_accel_processor, lsm330dlc_accel_sensor
-processor_input=k2dh_processor, k2dh_processor, k2dh_sensor
+multi_stream=enable
+filter_input=accel_filter, accel_filter, accel_sensor
+processor_input=accel_processor, accel_processor, accel_filter, accel_sensor
 version=1
 id=2211
 override=yes
 disable=no
 
 [geomag_datastream]
-multi_stream=disable
-filter_input=ak8973b_filter, ak8973b_filter, ak8973b_sensor
-filter_input=ak8975_filter, ak8975_filter, ak8975_sensor
-filter_input=yas529_filter, yas529_filter, yas529_sensor
-processor_input=bmm050_processor, bmm050_processor, bmm050_sensor
-processor_input=yas529_processor, yas529_processor, yas529_filter, bma023_sensor
-processor_input=ak8963cl_processor, ak8963cl_processor, lsm330dlc_accel_sensor
-processor_input=ak8973b_processor, ak8973b_processor, ak8973b_filter
-processor_input=ak8975_processor, ak8975_processor, ak8975_filter, kr3dm_sensor
-processor_input=ak8975c_processor, ak8975c_processor, ak8975c_sensor, bma254_sensor
-processor_input=ak8975ck_processor, ak8975ck_processor, kr3dm_sensor
-processor_input=ak8975cl_processor, ak8975cl_processor, lsm330dlc_accel_sensor
-processor_input=hscdtd008a_processor, hscdtd008a_processor, hscdtd008a_sensor
+multi_stream=enable
+filter_input=geo_filter, geo_filter, geo_sensor
+processor_input=geo_processor, geo_processor, geo_filter, accel_sensor
 version=1
 id=2212
 override=yes
 disable=no
 
 [lumin_datastream]
-multi_stream=disable
-filter_input=gp2ap002ambi_filter, gp2ap002ambi_filter, gp2ap002ambi_sensor
-filter_input=cm3623ambi_filter, cm3623ambi_filter, cm3623ambi_sensor
-filter_input=tmd2711ambi_filter, tmd2711ambi_filter, tmd2711ambi_sensor
-processor_input=gp2ap002ambi_processor, gp2ap002ambi_processor, gp2ap002ambi_filter
-processor_input=gp2ap020ambi_processor, gp2ap020ambi_processor, gp2ap020ambi_sensor
-processor_input=cm3623ambi_processor, cm3623ambi_processor, cm3623ambi_filter
-processor_input=cm36651ambi_processor, cm36651ambi_processor, cm36651ambi_sensor
-processor_input=tmd2711ambi_processor, tmd2711ambi_processor, tmd2711ambi_filter
-processor_input=tmd2772ambi_processor, tmd2772ambi_processor, tmd2772ambi_sensor
+multi_stream=enable
+filter_input=ambi_filter, ambi_filter, ambi_sensor
+processor_input=ambi_processor, ambi_processor, ambi_filter, ambi_sensor
 version=1
 id=2213
 override=yes
 disable=no
 
 [proxi_datastream]
-multi_stream=disable
-filter_input=gp2ap002proxi_filter, gp2ap002proxi_filter, gp2ap002proxi_sensor
-filter_input=cm3623proxi_filter, cm3623proxi_filter, cm3623proxi_sensor
-filter_input=tmd2711proxi_filter, tmd2711proxi_filter, tmd2711proxi_sensor
-processor_input=gp2ap002proxi_processor, gp2ap002proxi_processor, gp2ap002proxi_filter
-processor_input=gp2ap020proxi_processor, gp2ap020proxi_processor, gp2ap020proxi_sensor
-processor_input=cm3623proxi_processor, cm3623proxi_processor, cm3623proxi_filter
-processor_input=cm36651proxi_processor, cm36651proxi_processor, cm36651proxi_sensor
-processor_input=tmd2711proxi_processor, tmd2711proxi_processor, tmd2711proxi_filter
-processor_input=tmd2772proxi_processor, tmd2772proxi_processor, tmd2772proxi_sensor
-processor_input=px3315proxi_processor, px3315proxi_processor, px3315proxi_sensor
+multi_stream=enable
+filter_input=proxi_filter, proxi_filter, proxi_sensor
+processor_input=proxi_processor, proxi_processor, proxi_filter, proxi_sensor
 version=1
 id=2214
 override=yes
@@ -66,35 +36,35 @@ disable=no
 
 [motion_datastream]
 multi_stream=enable
-filter_input=motion_filter, motion_filter, bma023_sensor, kr3dm_sensor,lsm330dlc_accel_sensor, l3g4200d_sensor, lsm330dlc_gyro_sensor, gp2ap020proxi_sensor, cm3623proxi_sensor, cm36651proxi_sensor
-processor_input=motion_processor, motion_processor, motion_filter, lsm330dlc_accel_sensor
+filter_input=motion_filter, motion_filter, accel_sensor, gyro_sensor, proxi_sensor
+processor_input=motion_processor, motion_processor, motion_filter, accel_sensor, gyro_sensor, proxi_sensor
 version=1
 id=2209
 override=yes
 disable=no
 
 [gyro_datastream]
-multi_stream=disable
-filter_input=mpu3050_filter, mpu3050_filter
-processor_input=mpu3050_processor, mpu3050_processor, mpu3050_filter, bma023_sensor
-processor_input=l3g4200d_processor, l3g4200d_processor, l3g4200d_sensor
-processor_input=lsm330dlc_gyro_processor, lsm330dlc_gyro_processor, lsm330dlc_gyro_sensor
+multi_stream=enable
+filter_input=gyro_filter, gyro_filter, gyro_sensor
+processor_input=gyro_processor, gyro_processor, gyro_filter, gyro_sensor
 version=1
 id=2210
 override=yes
 disable=no
 
 [barometer_datastream]
-multi_stream=disable
-processor_input=lps331ap_processor, lps331ap_processor, lps331ap_sensor
+multi_stream=enable
+filter_input=barometer_filter, barometer_filter, barometer_sensor
+processor_input=barometer_processor, barometer_processor, barometer_sensor
 version=1
 id=2210
 override=yes
 disable=no
 
 [fusion_datastream]
-multi_stream=esable
-processor_input=fusion_processor, fusion_processor, lsm330dlc_accel_sensor, lsm330dlc_gyro_sensor, ak8975cl_sensor
+multi_stream=enable
+filter_input=fusion_filter, fusion_filter, accel_sensor, geo_sensor, gyro_sensor
+processor_input=fusion_processor, fusion_processor, accel_sensor, gyro_sensor, geo_sensor
 version=1
 id=2210
 override=yes
diff --git a/sf_filter.conf.in b/sf_filter.conf.in
index 6f695e1..5571d1c 100755
--- a/sf_filter.conf.in
+++ b/sf_filter.conf.in
@@ -1,46 +1,46 @@
-[bma023_filter]
+[accel_filter]
 path=/usr/lib/sensor_framework/libbma023_filter.so
 id=1223
 version=1
 disable=no
 override=yes
 
-[ak8973b_filter]
+[geo_filter]
 path=/usr/lib/sensor_framework/libak8973b_filter.so
 id=1224
 version=1
 disable=no
 override=yes
 
-[yas529_filter]
+[geo_filter]
 path=/usr/lib/sensor_framework/libyas529_filter.so
 id=1225
 version=1
 disable=no
 override=yes
 
-[gp2ap002ambi_filter]
+[ambi_filter]
 path=/usr/lib/sensor_framework/libgp2ap002ambi_filter.so
 id=1226
 version=1
 disable=no
 override=yes
 
-[gp2ap002proxi_filter]
+[proxi_filter]
 path=/usr/lib/sensor_framework/libgp2ap002proxi_filter.so
 id=1227
 version=1
 disable=no
 override=yes
 
-[cm3623ambi_filter]
+[ambi_filter]
 path=/usr/lib/sensor_framework/libcm3623ambi_filter.so
 id=1228
 version=1
 disable=no
 override=yes
 
-[cm3623proxi_filter]
+[proxi_filter]
 path=/usr/lib/sensor_framework/libcm3623proxi_filter.so
 id=1229
 version=1
@@ -54,21 +54,21 @@ version=1
 disable=no
 override=yes
 
-[tmd2711ambi_filter]
+[ambi_filter]
 path=/usr/lib/sensor_framework/libtmd2711ambi_filter.so
 id=1220
 version=1
 disable=no
 override=yes
 
-[tmd2711proxi_filter]
+[proxi_filter]
 path=/usr/lib/sensor_framework/libtmd2711proxi_filter.so
 id=1219
 version=1
 disable=no
 override=yes
 
-[ak8975_filter]
+[geo_filter]
 path=/usr/lib/sensor_framework/libak8975_filter.so
 id=1218
 version=1
diff --git a/sf_processor.conf.in b/sf_processor.conf.in
index 0f02746..89146da 100755
--- a/sf_processor.conf.in
+++ b/sf_processor.conf.in
@@ -1,39 +1,81 @@
-[bma023_processor]
+[accel_processor]
 path=/usr/lib/sensor_framework/libbma023_processor.so
 id=2114
 version=1
 override=yes
 disable=no
 
-[lsm330dlc_accel_processor]
+[accel_processor]
 path=/usr/lib/sensor_framework/liblsm330dlc_accel_processor.so
 id=2114
 version=1
 override=yes
 disable=no
 
-[k2dh_processor]
+[accel_processor]
+path=/usr/lib/sensor_framework/libmpu6000_accel_processor.so
+id=2114
+version=1
+override=yes
+disable=no
+
+[gyro_processor]
+path=/usr/lib/sensor_framework/libmpu6000_gyro_processor.so
+id=2121
+version=1
+override=yes
+disable=no
+
+[ambi_processor]
+path=/usr/lib/sensor_framework/libtmd3782ambi_processor.so
+id=2117
+version=1
+override=yes
+disable=no
+
+[proxi_processor]
+path=/usr/lib/sensor_framework/libtmd3782proxi_processor.so
+id=2118
+version=1
+override=yes
+disable=no
+
+[ambi_processor]
+path=/usr/lib/sensor_framework/libtmd27723ambi_processor.so
+id=2117
+version=1
+override=yes
+disable=no
+
+[proxi_processor]
+path=/usr/lib/sensor_framework/libtmd27723proxi_processor.so
+id=2118
+version=1
+override=yes
+disable=no
+
+[accel_processor]
 path=/usr/lib/sensor_framework/libk2dh_processor.so
 id=2114
 version=1
 override=yes
 disable=no
 
-[lps331ap_processor]
+[barometer_processor]
 path=/usr/lib/sensor_framework/liblps331ap_processor.so
 id=2114
 version=1
 override=yes
 disable=no
 
-[ak8973b_processor]
+[geo_processor]
 path=/usr/lib/sensor_framework/libak8973b_processor.so
 id=2115
 version=1
 override=yes
 disable=no
 
-[yas529_processor]
+[geo_processor]
 path=/usr/lib/sensor_framework/libyas529_processor.so
 id=2116
 version=1
@@ -47,63 +89,63 @@ version=1
 override=yes
 disable=no
 
-[gp2ap002ambi_processor]
+[ambi_processor]
 path=/usr/lib/sensor_framework/libgp2ap002ambi_processor.so
 id=2117
 version=1
 override=yes
 disable=no
 
-[gp2ap002proxi_processor]
+[proxi_processor]
 path=/usr/lib/sensor_framework/libgp2ap002proxi_processor.so
 id=2118
 version=1
 override=yes
 disable=no
 
-[gp2ap020ambi_processor]
+[ambi_processor]
 path=/usr/lib/sensor_framework/libgp2ap020ambi_processor.so
 id=2117
 version=1
 override=yes
 disable=no
 
-[gp2ap020proxi_processor]
+[proxi_processor]
 path=/usr/lib/sensor_framework/libgp2ap020proxi_processor.so
 id=2118
 version=1
 override=yes
 disable=no
 
-[cm3623ambi_processor]
+[ambi_processor]
 path=/usr/lib/sensor_framework/libcm3623ambi_processor.so
 id=2119
 version=1
 override=yes
 disable=no
 
-[cm3623proxi_processor]
+[proxi_processor]
 path=/usr/lib/sensor_framework/libcm3623proxi_processor.so
 id=2113
 version=1
 override=yes
 disable=no
 
-[px3315proxi_processor]
+[proxi_processor]
 path=/usr/lib/sensor_framework/libpx3315proxi_processor.so
 id=2113
 version=1
 override=yes
 disable=no
 
-[cm36651ambi_processor]
+[ambi_processor]
 path=/usr/lib/sensor_framework/libcm36651ambi_processor.so
 id=2119
 version=1
 override=yes
 disable=no
 
-[cm36651proxi_processor]
+[proxi_processor]
 path=/usr/lib/sensor_framework/libcm36651proxi_processor.so
 id=2113
 version=1
@@ -117,91 +159,91 @@ version=1
 override=yes
 disable=no
 
-[kr3dm_processor]
+[accel_processor]
 path=/usr/lib/sensor_framework/libkr3dm_processor.so
 id=2120
 version=1
 override=yes
 disable=no
 
-[l3g4200d_processor]
+[gyro_processor]
 path=/usr/lib/sensor_framework/libl3g4200d_processor.so
 id=2121
 version=1
 override=yes
 disable=no
 
-[lsm330dlc_gyro_processor]
+[gyro_processor]
 path=/usr/lib/sensor_framework/liblsm330dlc_gyro_processor.so
 id=2121
 version=1
 override=yes
 disable=no
 
-[tmd2711ambi_processor]
+[ambi_processor]
 path=/usr/lib/sensor_framework/libtmd2711ambi_processor.so
 id=2122
 version=1
 override=yes
 disable=no
 
-[tmd2711proxi_processor]
+[proxi_processor]
 path=/usr/lib/sensor_framework/libtmd2711proxi_processor.so
 id=2123
 version=1
 override=yes
 disable=no
 
-[ak8963cl_processor]
+[geo_processor]
 path=/usr/lib/sensor_framework/libak8963cl_processor.so
 id=2124
 version=1
 override=yes
 disable=no
 
-[ak8975_processor]
+[geo_processor]
 path=/usr/lib/sensor_framework/libak8975_processor.so
 id=2124
 version=1
 override=yes
 disable=no
 
-[ak8975c_processor]
+[geo_processor]
 path=/usr/lib/sensor_framework/libak8975c_processor.so
 id=2125
 version=1
 override=yes
 disable=no
 
-[ak8975cl_processor]
+[geo_processor]
 path=/usr/lib/sensor_framework/libak8975cl_processor.so
 id=2125
 version=1
 override=yes
 disable=no
 
-[ak8975ck_processor]
+[geo_processor]
 path=/usr/lib/sensor_framework/libak8975ck_processor.so
 id=2125
 version=1
 override=yes
 disable=no
 
-[bmm050_processor]
+[geo_processor]
 path=/usr/lib/sensor_framework/libbmm050_processor.so
 id=2130
 version=1
 override=yes
 disable=no
 
-[bma250_processor]
+[accel_processor]
 path=/usr/lib/sensor_framework/libbma250_processor.so
 id=2131
 version=1
 override=yes
 disable=no
 
-[bma254_processor]
+[accel_processor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libbma254_processor.so
@@ -209,7 +251,7 @@ id=1130
 version=1
 poll=100
 
-[tmd2772proxi_processor]
+[proxi_processor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libtmd2772proxi_processor.so
@@ -217,7 +259,7 @@ id=1131
 version=1
 poll=100
 
-[tmd2772ambi_processor]
+[ambi_processor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libtmd2772ambi_processor.so
diff --git a/sf_sensor.conf.in b/sf_sensor.conf.in
index 31f1821..91a0109 100755
--- a/sf_sensor.conf.in
+++ b/sf_sensor.conf.in
@@ -1,4 +1,4 @@
-[bma023_sensor]
+[accel_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libbma023.so
@@ -6,7 +6,7 @@ id=1114
 version=1
 poll=10
 
-[lsm330dlc_accel_sensor]
+[accel_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/liblsm330dlc_accel.so
@@ -14,7 +14,55 @@ id=1114
 version=1
 poll=200
 
-[k2dh_sensor]
+[accel_sensor]
+disable=no
+override=yes
+path=/usr/lib/sensor_framework/libmpu6000_accel.so
+id=1114
+version=1
+poll=200
+
+[gyro_sensor]
+disable=no
+override=yes
+path=/usr/lib/sensor_framework/libmpu6000_gyro.so
+id=1111
+version=1
+poll=18
+
+[ambi_sensor]
+disable=no
+override=yes
+path=/usr/lib/sensor_framework/libtmd3782ambi.so
+id=1117
+version=1
+poll=490
+
+[proxi_sensor]
+disable=no
+override=yes
+path=/usr/lib/sensor_framework/libtmd3782proxi.so
+id=1118
+version=1
+poll=90
+
+[ambi_sensor]
+disable=no
+override=yes
+path=/usr/lib/sensor_framework/libtmd27723ambi.so
+id=1117
+version=1
+poll=490
+
+[proxi_sensor]
+disable=no
+override=yes
+path=/usr/lib/sensor_framework/libtmd27723proxi.so
+id=1118
+version=1
+poll=90
+
+[accel_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libk2dh.so
@@ -22,7 +70,7 @@ id=1114
 version=1
 poll=10
 
-[lps331ap_sensor]
+[barometer_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/liblps331ap.so
@@ -30,7 +78,7 @@ id=1114
 version=1
 poll=100
 
-[ak8973b_sensor]
+[geo_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libak8973b.so
@@ -38,7 +86,7 @@ id=1115
 version=1
 poll=100
 
-[yas529_sensor]
+[geo_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libyas529.so
@@ -46,7 +94,7 @@ id=1116
 version=1
 poll=90
 
-[hscdtd008a_sensor]
+[accel_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libhscdtd008a.so
@@ -54,7 +102,7 @@ id=1116
 version=1
 poll=90
 
-[gp2ap002ambi_sensor]
+[ambi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libgp2ap002ambi.so
@@ -62,7 +110,7 @@ id=1117
 version=1
 poll=490
 
-[gp2ap002proxi_sensor]
+[proxi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libgp2ap002proxi.so
@@ -70,7 +118,7 @@ id=1118
 version=1
 poll=90
 
-[gp2ap020ambi_sensor]
+[ambi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libgp2ap020ambi.so
@@ -78,7 +126,7 @@ id=1117
 version=1
 poll=490
 
-[gp2ap020proxi_sensor]
+[proxi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libgp2ap020proxi.so
@@ -86,7 +134,7 @@ id=1118
 version=1
 poll=90
 
-[cm3623ambi_sensor]
+[ambi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libcm3623ambi.so
@@ -94,7 +142,7 @@ id=1119
 version=1
 poll=490
 
-[cm3623proxi_sensor]
+[proxi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libcm3623proxi.so
@@ -102,7 +150,7 @@ id=1113
 version=1
 poll=90
 
-[px3315proxi_sensor]
+[proxi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libpx3315proxi.so
@@ -110,7 +158,7 @@ id=1113
 version=1
 poll=90
 
-[cm36651ambi_sensor]
+[ambi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libcm36651ambi.so
@@ -118,7 +166,7 @@ id=1119
 version=1
 poll=490
 
-[cm36651proxi_sensor]
+[proxi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libcm36651proxi.so
@@ -126,7 +174,7 @@ id=1113
 version=1
 poll=90
 
-[kr3dm_sensor]
+[accel_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libkr3dm.so
@@ -134,7 +182,7 @@ id=1112
 version=1
 poll=10
 
-[l3g4200d_sensor]
+[gyro_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libl3g4200d.so
@@ -142,7 +190,7 @@ id=1111
 version=1
 poll=18
 
-[lsm330dlc_gyro_sensor]
+[gyro_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/liblsm330dlc_gyro.so
@@ -150,7 +198,7 @@ id=1111
 version=1
 poll=18
 
-[tmd2711ambi_sensor]
+[ambi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libtmd2711ambi.so
@@ -158,7 +206,7 @@ id=1110
 version=1
 poll=490
 
-[tmd2711proxi_sensor]
+[proxi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libtmd2711proxi.so
@@ -166,7 +214,7 @@ id=1109
 version=1
 poll=90
 
-[ak8963cl_sensor]
+[geo_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libak8963cl.so
@@ -174,7 +222,7 @@ id=1108
 version=1
 poll=100
 
-[ak8975_sensor]
+[geo_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libak8975.so
@@ -182,7 +230,7 @@ id=1108
 version=1
 poll=100
 
-[bmm050_sensor]
+[geo_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libbmm050.so
@@ -190,7 +238,7 @@ id=1120
 version=1
 poll=100
 
-[ak8975c_sensor]
+[geo_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libak8975c.so
@@ -198,7 +246,7 @@ id=1109
 version=1
 poll=100
 
-[ak8975cl_sensor]
+[geo_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libak8975cl.so
@@ -206,7 +254,7 @@ id=1109
 version=1
 poll=100
 
-[ak8975ck_sensor]
+[geo_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libak8975ck.so
@@ -214,7 +262,7 @@ id=1109
 version=1
 poll=100
 
-[bma250_sensor]
+[accel_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libbma250.so
@@ -222,7 +270,7 @@ id=1121
 version=1
 poll=100
 
-[bma254_sensor]
+[accel_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libbma254.so
@@ -230,7 +278,7 @@ id=1130
 version=1
 poll=100
 
-[tmd2772proxi_sensor]
+[proxi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libtmd2772proxi.so
@@ -238,7 +286,7 @@ id=1131
 version=1
 poll=100
 
-[tmd2772ambi_sensor]
+[ambi_sensor]
 disable=no
 override=yes
 path=/usr/lib/sensor_framework/libtmd2772ambi.so