--- a/tactilefeedback/tactilefeedbackresolver/inc/tactilefeedbackprivatecrkeys.h Mon May 03 12:47:28 2010 +0300
+++ b/tactilefeedback/tactilefeedbackresolver/inc/tactilefeedbackprivatecrkeys.h Fri Jun 11 13:57:13 2010 +0300
@@ -90,6 +90,30 @@
const TUint32 KTactileVibraIntensityBasicLevel3 = 0x00000022;
/**
+* Vibra intensity setting for logical feedback type ETouchFeedbackBasic
+* and vibra effect level ETactileFeedbackVibraLevel4.
+*
+* Possible values are:
+* Integers from 0 to 100. See HWRMVibra.h for more information.
+* Zero intensity will disable this logical feedback type.
+*
+* Default value: 60
+**/
+const TUint32 KTactileVibraIntensityBasicLevel4 = 0x00000023;
+
+/**
+* Vibra intensity setting for logical feedback type ETouchFeedbackBasic
+* and vibra effect level ETactileFeedbackVibraLevel5.
+*
+* Possible values are:
+* Integers from 0 to 100. See HWRMVibra.h for more information.
+* Zero intensity will disable this logical feedback type.
+*
+* Default value: 80
+**/
+const TUint32 KTactileVibraIntensityBasicLevel5 = 0x00000024;
+
+/**
* Vibra duration setting for logical feedback type ETouchFeedbackBasic
* and vibra effect level ETactileFeedbackVibraLevel1.
*
@@ -101,7 +125,7 @@
*
* Default value: 15
**/
-const TUint32 KTactileVibraDurationBasicLevel1 = 0x00000023;
+const TUint32 KTactileVibraDurationBasicLevel1 = 0x00000025;
/**
* Vibra duration setting for logical feedback type ETouchFeedbackBasic
@@ -115,7 +139,7 @@
*
* Default value: 20
**/
-const TUint32 KTactileVibraDurationBasicLevel2 = 0x00000024;
+const TUint32 KTactileVibraDurationBasicLevel2 = 0x00000026;
/**
* Vibra duration setting for logical feedback type ETouchFeedbackBasic
@@ -129,7 +153,35 @@
*
* Default value: 30
**/
-const TUint32 KTactileVibraDurationBasicLevel3 = 0x00000025;
+const TUint32 KTactileVibraDurationBasicLevel3 = 0x00000027;
+
+/**
+* Vibra duration setting for logical feedback type ETouchFeedbackBasic
+* and vibra effect level ETactileFeedbackVibraLevel4.
+*
+* Duration is given in milliseconds, and zero value will disable this
+* logical feedback type.
+*
+* Possible values are:
+* Integer values from zero upwards.
+*
+* Default value: 40
+**/
+const TUint32 KTactileVibraDurationBasicLevel4 = 0x00000028;
+
+/**
+* Vibra duration setting for logical feedback type ETouchFeedbackBasic
+* and vibra effect level ETactileFeedbackVibraLevel5.
+*
+* Duration is given in milliseconds, and zero value will disable this
+* logical feedback type.
+*
+* Possible values are:
+* Integer values from zero upwards.
+*
+* Default value: 50
+**/
+const TUint32 KTactileVibraDurationBasicLevel5 = 0x00000029;
/**
@@ -142,7 +194,7 @@
*
* Default value: 50
**/
-const TUint32 KTactileVibraIntensitySensitiveLevel1 = 0x00000026;
+const TUint32 KTactileVibraIntensitySensitiveLevel1 = 0x0000002a;
/**
* Vibra intensity setting for logical feedback type ETouchFeedbackSensitive
@@ -154,7 +206,7 @@
*
* Default value: 100
**/
-const TUint32 KTactileVibraIntensitySensitiveLevel2 = 0x00000027;
+const TUint32 KTactileVibraIntensitySensitiveLevel2 = 0x0000002b;
/**
* Vibra intensity setting for logical feedback type ETouchFeedbackSensitive
@@ -166,7 +218,31 @@
*
* Default value: 10
**/
-const TUint32 KTactileVibraIntensitySensitiveLevel3 = 0x00000028;
+const TUint32 KTactileVibraIntensitySensitiveLevel3 = 0x0000002c;
+
+/**
+* Vibra intensity setting for logical feedback type ETouchFeedbackSensitive
+* and vibra effect level ETactileFeedbackVibraLevel4.
+*
+* Possible values are:
+* Integers from 0 to 100. See HWRMVibra.h for more information.
+* Zero intensity will disable this logical feedback type.
+*
+* Default value: 10
+**/
+const TUint32 KTactileVibraIntensitySensitiveLevel4 = 0x0000002d;
+
+/**
+* Vibra intensity setting for logical feedback type ETouchFeedbackSensitive
+* and vibra effect level ETactileFeedbackVibraLevel5.
+*
+* Possible values are:
+* Integers from 0 to 100. See HWRMVibra.h for more information.
+* Zero intensity will disable this logical feedback type.
+*
+* Default value: 10
+**/
+const TUint32 KTactileVibraIntensitySensitiveLevel5 = 0x0000002e;
/**
@@ -181,7 +257,7 @@
*
* Default value: 5
**/
-const TUint32 KTactileVibraDurationSensitiveLevel1 = 0x00000029;
+const TUint32 KTactileVibraDurationSensitiveLevel1 = 0x0000002f;
/**
* Vibra duration setting for logical feedback type ETouchFeedbackSensitive
@@ -195,7 +271,7 @@
*
* Default value: 10
**/
-const TUint32 KTactileVibraDurationSensitiveLevel2 = 0x0000002a;
+const TUint32 KTactileVibraDurationSensitiveLevel2 = 0x00000030;
/**
* Vibra duration setting for logical feedback type ETouchFeedbackSensitive
@@ -209,7 +285,35 @@
*
* Default value: 15
**/
-const TUint32 KTactileVibraDurationSensitiveLevel3 = 0x0000002b;
+const TUint32 KTactileVibraDurationSensitiveLevel3 = 0x00000031;
+
+/**
+* Vibra duration setting for logical feedback type ETouchFeedbackSensitive
+* and vibra effect level ETactileFeedbackVibraLevel4.
+*
+* Duration is given in milliseconds, and zero value will disable this
+* logical feedback type.
+*
+* Possible values are:
+* Integer values from zero upwards.
+*
+* Default value: 20
+**/
+const TUint32 KTactileVibraDurationSensitiveLevel4 = 0x00000032;
+
+/**
+* Vibra duration setting for logical feedback type ETouchFeedbackSensitive
+* and vibra effect level ETactileFeedbackVibraLevel5.
+*
+* Duration is given in milliseconds, and zero value will disable this
+* logical feedback type.
+*
+* Possible values are:
+* Integer values from zero upwards.
+*
+* Default value: 25
+**/
+const TUint32 KTactileVibraDurationSensitiveLevel5 = 0x00000033;
@@ -259,6 +363,32 @@
const TUint32 KTactileAudioToneFreqBasicLevel3 = 0x00000042;
/**
+* Audio frequency setting for logical feedback type ETouchFeedbackBasic
+* and audio effect level ETactileFeedbackAudioLevel4.
+*
+* Frequency is given in Hz.
+*
+* Possible values are:
+* Positive integer values.
+*
+* Default value: 1100
+**/
+const TUint32 KTactileAudioToneFreqBasicLevel4 = 0x00000043;
+
+/**
+* Audio frequency setting for logical feedback type ETouchFeedbackBasic
+* and audio effect level ETactileFeedbackAudioLevel5.
+*
+* Frequency is given in Hz.
+*
+* Possible values are:
+* Positive integer values.
+*
+* Default value: 1100
+**/
+const TUint32 KTactileAudioToneFreqBasicLevel5 = 0x00000044;
+
+/**
* Audio duration setting for logical feedback type ETouchFeedbackBasic
* and audio effect level ETactileFeedbackAudioLevel1.
*
@@ -269,7 +399,7 @@
*
* Default value: 10
**/
-const TUint32 KTactileAudioToneDurationBasicLevel1 = 0x00000043;
+const TUint32 KTactileAudioToneDurationBasicLevel1 = 0x00000045;
/**
* Audio duration setting for logical feedback type ETouchFeedbackBasic
@@ -282,7 +412,7 @@
*
* Default value: 10
**/
-const TUint32 KTactileAudioToneDurationBasicLevel2 = 0x00000044;
+const TUint32 KTactileAudioToneDurationBasicLevel2 = 0x00000046;
/**
* Audio duration setting for logical feedback type ETouchFeedbackBasic
@@ -295,7 +425,33 @@
*
* Default value: 10
**/
-const TUint32 KTactileAudioToneDurationBasicLevel3 = 0x00000045;
+const TUint32 KTactileAudioToneDurationBasicLevel3 = 0x00000047;
+
+/**
+* Audio duration setting for logical feedback type ETouchFeedbackBasic
+* and audio effect level ETactileFeedbackAudioLevel4.
+*
+* Duration is given in milliseconds.
+*
+* Possible values are:
+* Zero (disables this feedback type) or positive integers
+*
+* Default value: 10
+**/
+const TUint32 KTactileAudioToneDurationBasicLevel4 = 0x00000048;
+
+/**
+* Audio duration setting for logical feedback type ETouchFeedbackBasic
+* and audio effect level ETactileFeedbackAudioLevel5.
+*
+* Duration is given in milliseconds.
+*
+* Possible values are:
+* Zero (disables this feedback type) or positive integers
+*
+* Default value: 10
+**/
+const TUint32 KTactileAudioToneDurationBasicLevel5 = 0x00000049;
/**
* Audio volume setting for logical feedback type ETouchFeedbackBasic
@@ -309,7 +465,7 @@
*
* Default value: 20
**/
-const TUint32 KTactileAudioToneVolumeBasicLevel1 = 0x00000046;
+const TUint32 KTactileAudioToneVolumeBasicLevel1 = 0x0000004a;
/**
* Audio volume setting for logical feedback type ETouchFeedbackBasic
@@ -323,7 +479,7 @@
*
* Default value: 40
**/
-const TUint32 KTactileAudioToneVolumeBasicLevel2 = 0x00000047;
+const TUint32 KTactileAudioToneVolumeBasicLevel2 = 0x0000004b;
/**
* Audio volume setting for logical feedback type ETouchFeedbackBasic
@@ -337,7 +493,35 @@
*
* Default value: 60
**/
-const TUint32 KTactileAudioToneVolumeBasicLevel3 = 0x00000048;
+const TUint32 KTactileAudioToneVolumeBasicLevel3 = 0x0000004c;
+
+/**
+* Audio volume setting for logical feedback type ETouchFeedbackBasic
+* and audio effect level ETactileFeedbackAudioLevel4.
+*
+* Volume level is given in percentages. 100% equals to
+* CMdaAudioToneUtility::MaxVolume, and 0% will disable this feedback type.
+*
+* Possible values are:
+* 0 - 100
+*
+* Default value: 80
+**/
+const TUint32 KTactileAudioToneVolumeBasicLevel4 = 0x0000004d;
+
+/**
+* Audio volume setting for logical feedback type ETouchFeedbackBasic
+* and audio effect level ETactileFeedbackAudioLevel5.
+*
+* Volume level is given in percentages. 100% equals to
+* CMdaAudioToneUtility::MaxVolume, and 0% will disable this feedback type.
+*
+* Possible values are:
+* 0 - 100
+*
+* Default value: 100
+**/
+const TUint32 KTactileAudioToneVolumeBasicLevel5 = 0x0000004e;
/**
@@ -351,7 +535,7 @@
*
* Default value: 1100
**/
-const TUint32 KTactileAudioToneFreqSensitiveLevel1 = 0x00000049;
+const TUint32 KTactileAudioToneFreqSensitiveLevel1 = 0x0000004f;
/**
* Audio frequency setting for logical feedback type ETouchFeedbackSensitive
@@ -364,7 +548,7 @@
*
* Default value: 1100
**/
-const TUint32 KTactileAudioToneFreqSensitiveLevel2 = 0x0000004a;
+const TUint32 KTactileAudioToneFreqSensitiveLevel2 = 0x00000050;
/**
* Audio frequency setting for logical feedback type ETouchFeedbackSensitive
@@ -377,7 +561,33 @@
*
* Default value: 1100
**/
-const TUint32 KTactileAudioToneFreqSensitiveLevel3 = 0x0000004b;
+const TUint32 KTactileAudioToneFreqSensitiveLevel3 = 0x00000051;
+
+/**
+* Audio frequency setting for logical feedback type ETouchFeedbackSensitive
+* and audio effect level ETactileFeedbackAudioLevel4.
+*
+* Frequency is given in Hz.
+*
+* Possible values are:
+* Positive integer values.
+*
+* Default value: 1100
+**/
+const TUint32 KTactileAudioToneFreqSensitiveLevel4 = 0x00000052;
+
+/**
+* Audio frequency setting for logical feedback type ETouchFeedbackSensitive
+* and audio effect level ETactileFeedbackAudioLevel5.
+*
+* Frequency is given in Hz.
+*
+* Possible values are:
+* Positive integer values.
+*
+* Default value: 1100
+**/
+const TUint32 KTactileAudioToneFreqSensitiveLevel5 = 0x00000053;
/**
@@ -391,7 +601,7 @@
*
* Default value: 10
**/
-const TUint32 KTactileAudioToneDurationSensitiveLevel1 = 0x0000004c;
+const TUint32 KTactileAudioToneDurationSensitiveLevel1 = 0x00000054;
/**
* Audio duration setting for logical feedback type ETouchFeedbackSensitive
@@ -404,7 +614,7 @@
*
* Default value: 10
**/
-const TUint32 KTactileAudioToneDurationSensitiveLevel2 = 0x0000004d;
+const TUint32 KTactileAudioToneDurationSensitiveLevel2 = 0x00000055;
/**
* Audio duration setting for logical feedback type ETouchFeedbackSensitive
@@ -417,7 +627,33 @@
*
* Default value: 10
**/
-const TUint32 KTactileAudioToneDurationSensitiveLevel3 = 0x0000004e;
+const TUint32 KTactileAudioToneDurationSensitiveLevel3 = 0x00000056;
+
+/**
+* Audio duration setting for logical feedback type ETouchFeedbackSensitive
+* and audio effect level ETactileFeedbackAudioLevel4.
+*
+* Duration is given in milliseconds.
+*
+* Possible values are:
+* Zero (disables this feedback type) or positive integers
+*
+* Default value: 10
+**/
+const TUint32 KTactileAudioToneDurationSensitiveLevel4 = 0x00000057;
+
+/**
+* Audio duration setting for logical feedback type ETouchFeedbackSensitive
+* and audio effect level ETactileFeedbackAudioLevel5.
+*
+* Duration is given in milliseconds.
+*
+* Possible values are:
+* Zero (disables this feedback type) or positive integers
+*
+* Default value: 10
+**/
+const TUint32 KTactileAudioToneDurationSensitiveLevel5 = 0x00000058;
/**
* Audio volume setting for logical feedback type ETouchFeedbackSensitive
@@ -431,7 +667,7 @@
*
* Default value: 10
**/
-const TUint32 KTactileAudioToneVolumeSensitiveLevel1 = 0x0000004f;
+const TUint32 KTactileAudioToneVolumeSensitiveLevel1 = 0x00000059;
/**
* Audio volume setting for logical feedback type ETouchFeedbackSensitive
@@ -445,7 +681,7 @@
*
* Default value: 25
**/
-const TUint32 KTactileAudioToneVolumeSensitiveLevel2 = 0x00000050;
+const TUint32 KTactileAudioToneVolumeSensitiveLevel2 = 0x0000005a;
/**
* Audio volume setting for logical feedback type ETouchFeedbackSensitive
@@ -459,7 +695,35 @@
*
* Default value: 40
**/
-const TUint32 KTactileAudioToneVolumeSensitiveLevel3 = 0x00000051;
+const TUint32 KTactileAudioToneVolumeSensitiveLevel3 = 0x0000005b;
+
+/**
+* Audio volume setting for logical feedback type ETouchFeedbackSensitive
+* and audio effect level ETactileFeedbackAudioLevel4.
+*
+* Volume level is given in percentages. 100% equals to
+* CMdaAudioToneUtility::MaxVolume, and 0% will disable this feedback type.
+*
+* Possible values are:
+* 0 - 100
+*
+* Default value: 55
+**/
+const TUint32 KTactileAudioToneVolumeSensitiveLevel4 = 0x0000005c;
+
+/**
+* Audio volume setting for logical feedback type ETouchFeedbackSensitive
+* and audio effect level ETactileFeedbackAudioLevel5.
+*
+* Volume level is given in percentages. 100% equals to
+* CMdaAudioToneUtility::MaxVolume, and 0% will disable this feedback type.
+*
+* Possible values are:
+* 0 - 100
+*
+* Default value: 70
+**/
+const TUint32 KTactileAudioToneVolumeSensitiveLevel5 = 0x0000005d;
// =============================================================================
// Configuration options related to audio .wav feedback