Merge "[ACR-1343] Add new thermistor features to measure temperature" into tizensubmit/tizen/20190215.020930accepted/tizen/unified/20190215.055123

5 files changed, 14 insertions, 1 deletions

diff --git a/packaging/domain-apis-system.inc b/packaging/domain-apis-system.inc
index fa23db6..a86e7f1 100644
--- a/packaging/domain-apis-system.inc
+++ b/packaging/domain-apis-system.inc
@@ -103,7 +103,7 @@ capi-system-runtime-info provides the current system state.<br>
 To get the process information, you need to add one of these resource manager features below;<br>
   * Tizen Resource Manager - Full Featured<br>
   * Tizen Resource Manager - For Headless Devices<br>
-  * Tizen Resource Manager - Light-Weight   
+  * Tizen Resource Manager - Light-Weight
 %files sub2-domain_API-System-Runtime_Information
 
 %package sub2-domain_API-System-Sensor_Listener
diff --git a/packaging/platform-preset-boards-artik530.inc b/packaging/platform-preset-boards-artik530.inc
index 4d467e5..a7f6d5e 100644
--- a/packaging/platform-preset-boards-artik530.inc
+++ b/packaging/platform-preset-boards-artik530.inc
@@ -89,6 +89,7 @@ If you select 3 partitions, please select system-plugin-device-u3.
 If you don't use initrd partition, please select system-plugin-feature-init_wrapper.
 %files sub2-Preset_boards-ARTIK530-System
 
+
 ### ARTIK530-System_Device ###
 %package sub2-Preset_boards-ARTIK530-System_Device
 Summary:	ARTIK530_Deviced Plugin
@@ -99,6 +100,8 @@ Requires:	device-manager-plugin-artik
 %description sub2-Preset_boards-ARTIK530-System_Device
 Packages for Deviced HAL and Feature.
 %files sub2-Preset_boards-ARTIK530-System_Device
+%posttrans sub2-Preset_boards-ARTIK530-System_Device
+%tizen_feature tizen.org/feature/thermistor.ap true
 
 
 ### ARTIK530-Audio ###
diff --git a/packaging/platform-preset-boards-rpi3.inc b/packaging/platform-preset-boards-rpi3.inc
index 1319239..c9a6bfb 100644
--- a/packaging/platform-preset-boards-rpi3.inc
+++ b/packaging/platform-preset-boards-rpi3.inc
@@ -85,6 +85,7 @@ Requires:	model-config-default
 Packages for System HAL and Feature. They are mandatory.
 %files sub2-Preset_boards-RPI3-System
 
+
 ### RPI3-System_Device ###
 %package sub2-Preset_boards-RPI3-System_Device
 Summary:	RPI3_Deviced Plugin
@@ -95,6 +96,8 @@ Requires:	device-manager-plugin-rpi3
 %description sub2-Preset_boards-RPI3-System_Device
 Packages for Deviced HAL and Feature.
 %files sub2-Preset_boards-RPI3-System_Device
+%posttrans sub2-Preset_boards-RPI3-System_Device
+%tizen_feature tizen.org/feature/thermistor.ap true
 
 
 ### RPI3-Audio ###
diff --git a/packaging/platform-preset-boards-tm1.inc b/packaging/platform-preset-boards-tm1.inc
index 2004ec4..f182f7b 100644
--- a/packaging/platform-preset-boards-tm1.inc
+++ b/packaging/platform-preset-boards-tm1.inc
@@ -65,6 +65,7 @@ Firstly select HALs and Feature to add to your image.
 %tizen_feature tizen.org/feature/accessibility.grayscale false
 %tizen_feature tizen.org/feature/accessibility.negativee false
 
+
 ### TM1-System ###
 %package sub2-Preset_boards-TM1-System
 Summary:	TM1_System
@@ -77,6 +78,7 @@ Requires:	model-config-tm1
 Packages for System HAL and Feature. They are mandatory.
 %files sub2-Preset_boards-TM1-System
 
+
 ### TM1-System_Device ###
 %package sub2-Preset_boards-TM1-System_Device
 Summary:        TM1_Deviced Plugin
@@ -89,6 +91,8 @@ Packages for Deviced HAL and Feature.
 %posttrans sub2-Preset_boards-TM1-System_Device
 %tizen_feature tizen.org/feature/battery true
 %tizen_feature tizen.org/feature/led true
+%tizen_feature tizen.org/feature/thermistor.ap true
+%tizen_feature tizen.org/feature/thermistor.battery true
 
 ### TM1-Audio ###
 %package sub2-Preset_boards-TM1-Audio
diff --git a/packaging/platform-preset-boards-tm2.inc b/packaging/platform-preset-boards-tm2.inc
index 55b44bc..6f69df5 100644
--- a/packaging/platform-preset-boards-tm2.inc
+++ b/packaging/platform-preset-boards-tm2.inc
@@ -86,6 +86,7 @@ If you select 3 partitions, please select system-plugin-u3.
 If you don't use initrd partition, please select system-plugin-init_wrapper.
 %files sub2-Preset_boards-TM2-System
 
+
 ### TM2-System_Device ###
 %package sub2-Preset_boards-TM2-System_Device
 Summary:	TM2_Deviced Plugin
@@ -99,6 +100,8 @@ Packages for Deviced HAL and Feature.
 %tizen_feature tizen.org/feature/battery true
 %tizen_feature tizen.org/feature/led true
 %tizen_feature tizen.org/feature/consumer_ir true
+%tizen_feature tizen.org/feature/thermistor.ap true
+%tizen_feature tizen.org/feature/thermistor.battery true
 
 ### TM2-Audio ###
 %package sub2-Preset_boards-TM2-Audio