Index: format/app_shutter_dy.format
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/format/app_shutter_dy.format	(revision 6404)
+++ /1121s/branch/shutter/yc1089s_fouse_public/format/app_shutter_dy.format	(working copy)
@@ -187,11 +187,11 @@
 8 mem_ble_shutter_dy_interval_min_ios
 
 10 mem_fouse_up_press
-2 mem_fouse_up_long_press
-2 mem_fouse_up_long_release
+1 mem_fouse_up_long_press
+1 mem_fouse_up_long_release
 10 mem_fouse_down_press
-2 mem_fouse_down_long_press
-2 mem_fouse_down_long_release
+1 mem_fouse_down_long_press
+1 mem_fouse_down_long_release
 1 mem_shutter_key_evt_timer_count
 4 mem_shutter_key_evt_btclk
 1 mem_shutter_dy_fouse_time
@@ -217,8 +217,12 @@
 1 mem_shutter_adc_read_time_init
 1 mem_shutter_low_volatge_led_time
 1 mem_shutter_low_voltage_led_status
-2 mem_shutter_dy_vedio_fast_forward_press
-2 mem_shutter_dy_vedio_fast_forward_release
+1 mem_shutter_dy_vedio_fast_forward_press
+1 mem_shutter_dy_vedio_fast_forward_release
+2 mem_shutter_ios_set_hid_map
+2 mem_shutter_ios_Usage
+2 mem_shutter_android_Usage
+2 mem_shutter_android_set_hid_map
 0 mem_shutter_dy_end
 )
 
Index: output/otp.dat
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/output/otp.dat	(revision 6404)
+++ /1121s/branch/shutter/yc1089s_fouse_public/output/otp.dat	(working copy)
@@ -11,100 +11,104 @@
 00
 aa
 55
-8e
+d6
 11
 c2
 84
 00
-18
+19
 c0
 00
 00
-51
+52
 c0
 01
 01
-22
+29
 c0
 08
 81
-2b
+32
 c0
 0a
 02
-f8
+ff
 c0
 0a
 81
-bd
+c4
 c0
 0c
 01
-cb
+d2
 c0
 0c
 81
-8a
+91
 c0
 0d
 01
-3d
+44
 c0
 12
 83
-1a
+21
 c0
 13
 80
-7c
+7d
 c0
 51
 80
-c4
+c5
 c0
 52
-80
-fc
+81
+03
 c0
 53
 00
-87
+88
 c0
 53
 80
-9a
+9b
 c0
 55
 00
-ec
+ed
+c0
+55
+83
+c0
 c0
 58
 81
-dd
+e4
 c0
 62
 00
-1f
+20
 c0
 62
 81
-d2
+d9
 c0
 6d
 02
-e1
+e8
 c0
 6d
 84
-0a
+1c
 c0
 6e
 04
-47
+59
 c0
 6e
 84
-28
+3a
 20
 20
 23
@@ -112,23 +116,23 @@
 c0
 12
 00
-55
+56
 c0
 12
 80
-d5
+d6
 c0
 13
 00
-da
+db
 c0
 1c
 83
-14
+1b
 c0
 26
 83
-18
+1f
 c1
 7f
 80
@@ -172,7 +176,7 @@
 20
 20
 80
-49
+4a
 6f
 f0
 80
@@ -292,11 +296,11 @@
 20
 20
 80
-25
+26
 c5
 11
 00
-49
+4a
 79
 20
 00
@@ -304,7 +308,7 @@
 20
 20
 00
-26
+27
 6f
 f1
 00
@@ -328,11 +332,11 @@
 24
 20
 80
-25
+26
 c2
 00
 00
-22
+23
 20
 20
 6b
@@ -360,7 +364,7 @@
 c5
 97
 80
-5b
+5c
 78
 3c
 fc
@@ -404,7 +408,7 @@
 20
 37
 00
-64
+65
 1b
 42
 04
@@ -452,7 +456,7 @@
 20
 40
 00
-72
+73
 6f
 e0
 81
@@ -560,23 +564,23 @@
 c0
 00
 80
-8e
+8f
 c0
 03
 00
-90
+91
 c0
 03
 80
-94
+95
 c0
 04
 00
-98
+99
 c0
 04
 80
-99
+9a
 20
 20
 65
@@ -584,18 +588,18 @@
 da
 60
 4f
-f8
+f4
 20
 20
 63
 71
 70
 4f
-d9
+d5
 02
 70
 4f
-da
+d6
 01
 da
 60
@@ -607,16 +611,16 @@
 71
 70
 4f
-d9
+d5
 02
 70
 4f
-da
+d6
 02
 da
 60
 4f
-c6
+c4
 20
 20
 63
@@ -644,7 +648,7 @@
 20
 40
 00
-a0
+a1
 20
 74
 00
@@ -692,7 +696,7 @@
 20
 22
 80
-ac
+ad
 18
 e0
 8e
@@ -700,7 +704,7 @@
 20
 20
 00
-a1
+a2
 67
 e1
 4a
@@ -748,11 +752,11 @@
 20
 22
 80
-b9
+ba
 20
 20
 00
-b8
+b9
 70
 4e
 c0
@@ -804,7 +808,7 @@
 24
 3a
 00
-ce
+cf
 70
 4c
 00
@@ -816,7 +820,7 @@
 20
 40
 00
-d1
+d2
 20
 40
 65
@@ -848,7 +852,7 @@
 20
 20
 00
-c6
+c7
 df
 e0
 00
@@ -976,7 +980,7 @@
 c0
 00
 80
-f2
+f3
 20
 20
 66
@@ -992,7 +996,7 @@
 c0
 03
 00
-f6
+f7
 20
 60
 00
@@ -1000,7 +1004,7 @@
 20
 20
 00
-f7
+f8
 70
 4e
 aa
@@ -1018,6 +1022,30 @@
 e5
 0a
 20
+20
+00
+fd
+6f
+e1
+4f
+fa
+67
+e1
+48
+d6
+6f
+e1
+4f
+fc
+67
+e1
+49
+02
+67
+e1
+49
+4c
+20
 60
 00
 00
@@ -1076,7 +1104,7 @@
 24
 3a
 01
-0b
+12
 20
 20
 65
@@ -1100,15 +1128,15 @@
 c0
 00
 81
-15
+1c
 c0
 03
 01
-17
+1e
 c0
 03
 81
-1b
+22
 da
 60
 4a
@@ -1124,7 +1152,7 @@
 da
 60
 4f
-fa
+f5
 20
 20
 63
@@ -1132,15 +1160,15 @@
 20
 40
 01
-1f
+26
 20
 40
 03
-83
+8a
 da
 60
 4f
-c4
+c3
 20
 20
 63
@@ -1148,26 +1176,26 @@
 20
 40
 01
-1f
+26
 20
 40
 03
-a6
+ad
 da
 60
 4f
-d2
+cf
 20
 20
 63
 71
 70
 4f
-d9
+d5
 00
 70
 4f
-da
+d6
 00
 20
 60
@@ -1208,7 +1236,7 @@
 20
 20
 01
-22
+29
 70
 8a
 0f
@@ -1328,7 +1356,7 @@
 20
 40
 01
-92
+99
 6f
 e0
 c4
@@ -1340,7 +1368,7 @@
 24
 55
 81
-39
+40
 37
 d9
 82
@@ -1356,7 +1384,7 @@
 c0
 08
 01
-7f
+86
 6f
 e0
 c4
@@ -1400,7 +1428,7 @@
 20
 40
 01
-71
+78
 70
 80
 43
@@ -1424,15 +1452,15 @@
 20
 40
 02
-b3
+ba
 20
 40
 02
-de
+e5
 20
 40
 01
-6b
+72
 70
 8a
 30
@@ -1464,7 +1492,7 @@
 20
 20
 02
-e0
+e7
 20
 75
 80
@@ -1496,7 +1524,7 @@
 c0
 0c
 01
-77
+7e
 6f
 e0
 c4
@@ -1588,7 +1616,7 @@
 20
 20
 01
-58
+5f
 6f
 e0
 c1
@@ -1596,7 +1624,7 @@
 c0
 05
 01
-8d
+94
 20
 20
 22
@@ -1624,7 +1652,7 @@
 20
 35
 81
-b9
+c0
 6f
 e2
 02
@@ -1792,7 +1820,7 @@
 20
 20
 01
-a3
+aa
 20
 40
 68
@@ -1936,7 +1964,7 @@
 20
 40
 03
-b9
+cb
 70
 40
 94
@@ -1944,7 +1972,7 @@
 20
 40
 01
-d5
+dc
 20
 40
 64
@@ -1964,7 +1992,7 @@
 58
 00
 02
-46
+4d
 67
 e1
 43
@@ -1972,7 +2000,7 @@
 58
 00
 02
-23
+2a
 67
 e1
 43
@@ -1980,7 +2008,7 @@
 58
 00
 02
-38
+3f
 67
 e1
 43
@@ -1996,7 +2024,7 @@
 58
 00
 02
-01
+08
 67
 e1
 43
@@ -2012,7 +2040,7 @@
 58
 00
 02
-16
+1d
 67
 e1
 43
@@ -2076,7 +2104,7 @@
 20
 40
 02
-06
+0d
 20
 40
 70
@@ -2120,7 +2148,7 @@
 20
 22
 82
-11
+18
 1f
 e2
 04
@@ -2128,7 +2156,7 @@
 20
 40
 02
-14
+1b
 1a
 20
 a2
@@ -2136,7 +2164,7 @@
 c2
 00
 02
-0b
+12
 20
 60
 00
@@ -2152,11 +2180,11 @@
 20
 40
 03
-ce
+e0
 20
 40
 03
-bb
+cd
 20
 40
 67
@@ -2168,7 +2196,7 @@
 20
 40
 02
-1c
+23
 20
 20
 64
@@ -2180,7 +2208,7 @@
 da
 40
 02
-1f
+26
 20
 20
 42
@@ -2208,19 +2236,19 @@
 c0
 20
 02
-2f
+36
 c0
 18
 82
-2d
+34
 c0
 0a
 82
-2a
+31
 c0
 0a
 02
-29
+30
 20
 20
 64
@@ -2272,7 +2300,7 @@
 24
 3a
 02
-43
+4a
 6f
 e4
 4f
@@ -2292,7 +2320,7 @@
 c0
 12
 02
-3b
+42
 20
 60
 00
@@ -2316,7 +2344,7 @@
 24
 3a
 02
-43
+4a
 6f
 e4
 4f
@@ -2344,7 +2372,7 @@
 20
 40
 02
-51
+58
 d8
 e0
 00
@@ -2380,11 +2408,11 @@
 20
 40
 02
-6b
+72
 20
 20
 03
-43
+4a
 6f
 e1
 44
@@ -2392,7 +2420,7 @@
 c2
 84
 82
-56
+5d
 d8
 a0
 45
@@ -2440,7 +2468,7 @@
 24
 21
 02
-62
+69
 6f
 e0
 c9
@@ -2552,7 +2580,7 @@
 20
 40
 02
-88
+8f
 6f
 e1
 06
@@ -2600,7 +2628,7 @@
 c2
 00
 02
-74
+7b
 20
 60
 00
@@ -2644,7 +2672,7 @@
 20
 20
 02
-92
+99
 1a
 60
 8c
@@ -2656,7 +2684,7 @@
 20
 20
 02
-95
+9c
 20
 40
 65
@@ -2672,7 +2700,7 @@
 20
 40
 02
-ab
+b2
 18
 e2
 7e
@@ -2680,19 +2708,19 @@
 c0
 03
 02
-9f
+a6
 c0
 03
 82
-a1
+a8
 c0
 04
 02
-a3
+aa
 c0
 04
 82
-aa
+b1
 20
 20
 65
@@ -2708,7 +2736,7 @@
 da
 60
 4f
-c6
+c4
 20
 20
 63
@@ -2716,7 +2744,7 @@
 20
 40
 02
-a5
+ac
 20
 20
 63
@@ -2724,7 +2752,7 @@
 da
 60
 4f
-dc
+d8
 20
 40
 67
@@ -2736,7 +2764,7 @@
 da
 60
 4f
-e2
+de
 20
 60
 00
@@ -2752,7 +2780,7 @@
 70
 49
 e5
-5a
+32
 20
 40
 67
@@ -2828,7 +2856,7 @@
 20
 40
 02
-d0
+d7
 2a
 2f
 fe
@@ -2860,7 +2888,7 @@
 20
 40
 02
-d0
+d7
 d8
 a0
 8a
@@ -2888,7 +2916,7 @@
 20
 21
 02
-c5
+cc
 20
 20
 21
@@ -2992,7 +3020,7 @@
 20
 40
 02
-f1
+f8
 70
 8a
 08
@@ -3036,7 +3064,7 @@
 c3
 02
 82
-f2
+f9
 68
 59
 01
@@ -3072,7 +3100,7 @@
 c0
 08
 03
-11
+18
 58
 00
 57
@@ -3116,7 +3144,7 @@
 c0
 08
 03
-0e
+15
 58
 00
 2b
@@ -3152,7 +3180,7 @@
 20
 20
 03
-0a
+11
 58
 00
 83
@@ -3163,8 +3191,8 @@
 07
 20
 20
-02
-ff
+03
+06
 6f
 e0
 c3
@@ -3212,7 +3240,7 @@
 20
 40
 03
-2b
+32
 6f
 e0
 c0
@@ -3324,7 +3352,7 @@
 20
 22
 83
-3e
+45
 e7
 e0
 80
@@ -3344,7 +3372,7 @@
 c2
 00
 03
-38
+3f
 1a
 42
 04
@@ -3360,7 +3388,7 @@
 68
 4a
 4f
-d5
+d1
 1c
 42
 24
@@ -3392,7 +3420,7 @@
 24
 21
 03
-55
+5c
 1a
 20
 a2
@@ -3404,7 +3432,7 @@
 24
 3a
 03
-49
+50
 da
 20
 00
@@ -3412,7 +3440,7 @@
 20
 40
 03
-5a
+61
 1c
 42
 7e
@@ -3420,7 +3448,7 @@
 67
 e2
 4f
-d5
+d1
 20
 60
 00
@@ -3444,15 +3472,15 @@
 60
 4a
 4f
-d5
+d1
 67
 e0
 cf
-d4
+d0
 6f
 e0
 cf
-d4
+d0
 20
 7a
 00
@@ -3464,23 +3492,23 @@
 67
 e0
 cf
-d4
+d0
 20
 40
 03
-61
+68
 20
 20
 03
-5b
+62
 da
 60
 4f
-d9
+d5
 da
 40
 03
-64
+6b
 20
 20
 42
@@ -3488,15 +3516,15 @@
 6f
 e0
 cf
-da
+d6
 c0
 00
 83
-68
+6f
 c0
 01
 03
-8b
+92
 20
 60
 00
@@ -3508,19 +3536,19 @@
 24
 3a
 03
-77
+7e
 70
 49
 e5
 08
 70
 4f
-d9
+d5
 01
 6f
 e0
 cf
-db
+d7
 1f
 e0
 fe
@@ -3528,7 +3556,7 @@
 67
 e0
 cf
-db
+d7
 1f
 e6
 7c
@@ -3536,7 +3564,7 @@
 20
 42
 83
-83
+8a
 da
 60
 4f
@@ -3544,7 +3572,7 @@
 20
 40
 03
-ae
+b5
 ef
 e1
 00
@@ -3564,11 +3592,11 @@
 20
 40
 03
-b6
+bd
 6f
 e0
 cf
-db
+d7
 1f
 e0
 fe
@@ -3576,7 +3604,7 @@
 67
 e0
 cf
-db
+d7
 1f
 e6
 7c
@@ -3584,7 +3612,7 @@
 20
 42
 83
-83
+8a
 da
 60
 4f
@@ -3592,7 +3620,7 @@
 20
 40
 03
-ae
+b5
 ef
 e1
 00
@@ -3611,12 +3639,12 @@
 71
 70
 4f
-db
+d7
 00
 da
 60
 4f
-c4
+c3
 20
 40
 63
@@ -3628,7 +3656,7 @@
 20
 40
 03
-ae
+b5
 58
 00
 06
@@ -3648,19 +3676,19 @@
 24
 3a
 03
-9a
+a1
 70
 49
 e5
 08
 70
 4f
-d9
+d5
 01
 6f
 e0
 cf
-db
+d7
 1f
 e0
 fe
@@ -3668,7 +3696,7 @@
 67
 e0
 cf
-db
+d7
 1f
 e6
 7c
@@ -3676,15 +3704,15 @@
 20
 42
 83
-a6
+ad
 da
 60
 4f
-d0
+ce
 20
 40
 03
-ae
+b5
 ef
 e1
 00
@@ -3704,11 +3732,11 @@
 20
 40
 03
-b6
+bd
 6f
 e0
 cf
-db
+d7
 1f
 e0
 fe
@@ -3716,7 +3744,7 @@
 67
 e0
 cf
-db
+d7
 1f
 e6
 7c
@@ -3724,15 +3752,15 @@
 20
 42
 83
-a6
+ad
 da
 60
 4f
-d0
+ce
 20
 40
 03
-ae
+b5
 ef
 e1
 00
@@ -3751,12 +3779,12 @@
 71
 70
 4f
-db
+d7
 00
 da
 60
 4f
-d2
+cf
 20
 40
 63
@@ -3764,11 +3792,11 @@
 da
 60
 4f
-d0
+ce
 20
 40
 03
-ae
+b5
 58
 00
 07
@@ -3819,15 +3847,59 @@
 01
 70
 4f
-d9
+d5
 03
 20
 60
 00
 00
 70
+4e
+aa
+05
+70
+49
+e4
+01
+70
+4e
+b2
+01
+70
+49
+e5
+3c
+20
+20
+03
+c5
+6f
+e1
 4f
-f0
+f8
+67
+e1
+48
+d6
+6f
+e1
+4f
+f6
+67
+e1
+49
+02
+67
+e1
+49
+4c
+20
+60
+00
+00
+70
+4f
+ec
 01
 20
 60
@@ -3836,7 +3908,7 @@
 6f
 e0
 cf
-f0
+ec
 20
 7a
 00
@@ -3844,7 +3916,7 @@
 6f
 e0
 cf
-f2
+ee
 20
 7a
 00
@@ -3852,23 +3924,23 @@
 da
 60
 4f
-f6
+f2
 da
 40
 03
-c2
+d4
 20
 20
 42
 e0
 70
 4f
-f6
+f2
 05
 6f
 e0
 cf
-f7
+f3
 79
 40
 7e
@@ -3876,7 +3948,7 @@
 67
 e0
 cf
-f7
+f3
 c0
 00
 c3
@@ -3888,7 +3960,7 @@
 6f
 e0
 cf
-f1
+ed
 1f
 e0
 fe
@@ -3896,11 +3968,11 @@
 67
 e0
 cf
-f1
+ed
 68
 48
 cf
-f5
+f1
 98
 46
 7c
@@ -3912,7 +3984,7 @@
 6f
 e0
 cf
-f0
+ec
 20
 7a
 00
@@ -3920,14 +3992,14 @@
 20
 40
 03
-c8
+da
 24
 61
 00
 00
 70
 4f
-f1
+ed
 00
 70
 44
@@ -3944,23 +4016,23 @@
 20
 40
 04
-47
+59
 20
 40
 04
-28
+3a
 67
 e1
 4f
-ee
+ea
 da
 20
 4f
-e8
+e4
 20
 40
 03
-e0
+f2
 6f
 e0
 c4
@@ -3968,19 +4040,19 @@
 c2
 80
 84
-00
+12
 c3
 00
 04
-04
+16
 70
 4f
-f3
+ef
 01
 20
 20
 04
-02
+14
 ef
 e4
 00
@@ -4039,8 +4111,8 @@
 00
 20
 21
-03
-fc
+04
+0e
 68
 49
 06
@@ -4051,12 +4123,12 @@
 00
 24
 21
-03
-fe
+04
+10
 20
 3a
-03
-fe
+04
+10
 1f
 ef
 a2
@@ -4088,14 +4160,14 @@
 67
 e0
 cf
-f4
+f0
 20
 60
 00
 00
 70
 4f
-f4
+f0
 64
 20
 60
@@ -4103,7 +4175,7 @@
 00
 70
 4f
-f4
+f0
 00
 20
 60
@@ -4119,7 +4191,7 @@
 27
 70
 4f
-f2
+ee
 01
 20
 60
@@ -4127,12 +4199,12 @@
 00
 70
 4f
-f2
+ee
 00
 6f
 e0
 cf
-f3
+ef
 20
 7a
 00
@@ -4143,7 +4215,7 @@
 25
 70
 4f
-f3
+ef
 00
 20
 60
@@ -4276,11 +4348,11 @@
 c0
 00
 84
-2c
+3e
 c0
 01
 04
-33
+45
 20
 60
 00
@@ -4312,7 +4384,7 @@
 20
 20
 04
-39
+4b
 58
 00
 03
@@ -4360,7 +4432,7 @@
 20
 40
 04
-1b
+2d
 6f
 f0
 8a
@@ -4396,7 +4468,7 @@
 20
 40
 04
-3e
+50
 20
 40
 6f
@@ -4424,7 +4496,7 @@
 20
 40
 04
-3e
+50
 6f
 e0
 c4
@@ -4456,7 +4528,7 @@
 20
 40
 04
-60
+72
 68
 59
 01
@@ -4500,13 +4572,13 @@
 c3
 02
 84
-60
+72
 20
 60
 00
 00
-55
-27
+a6
+ed
 aa
 55
 40
@@ -4534,7 +4606,7 @@
 00
 00
 e8
-04
+0c
 02
 00
 30
@@ -4733,21 +4805,21 @@
 55
 01
 00
-f6
+f2
 4f
 05
 aa
 55
 01
 00
-f5
+f1
 4f
 05
 aa
 55
 06
 00
-e8
+e4
 4f
 e4
 0c
@@ -5088,7 +5160,7 @@
 00
 aa
 55
-1c
+18
 00
 b8
 4f
@@ -5103,9 +5175,7 @@
 25
 26
 27
-00
 28
-00
 26
 25
 24
@@ -5118,13 +5188,19 @@
 1d
 29
 00
+aa
+55
+02
+00
+cf
+4f
 2a
 00
 aa
 55
 04
 00
-dc
+d8
 4f
 02
 01
@@ -5134,7 +5210,7 @@
 55
 06
 00
-e2
+de
 4f
 2d
 2e
@@ -5144,14 +5220,12 @@
 34
 aa
 55
-04
+02
 00
-f8
+f4
 4f
 35
-00
 36
-00
 aa
 55
 01
@@ -5950,6 +6024,32 @@
 01
 aa
 55
+04
+00
+f6
+4f
+09
+38
+09
+05
+aa
+55
+02
+00
+fc
+4f
+09
+47
+aa
+55
+02
+00
+fa
+4f
+09
+04
+aa
+55
 9c
 01
 d2
@@ -6372,13 +6472,13 @@
 00
 d0
 49
-f3
+c3
 00
-f3
+c3
 00
 aa
 55
-f3
+c3
 00
 ae
 48
@@ -6504,14 +6604,8 @@
 c0
 05
 0d
-09
-05
-a1
-01
-09
-22
 a1
-02
+00
 09
 42
 15
@@ -6583,48 +6677,6 @@
 02
 c0
 c0
-05
-01
-09
-06
-a1
-01
-85
-05
-05
-04
-19
-e0
-29
-e7
-15
-00
-25
-01
-75
-01
-95
-08
-81
-02
-75
-08
-95
-01
-15
-00
-25
-f4
-05
-04
-19
-00
-29
-f4
-81
-00
-c0
-c0
 aa
 55
 10
@@ -6839,7 +6891,7 @@
 aa
 aa
 55
-78
-9f
-3f
-20
+f9
+9c
+4a
+3c
Index: output/ramcode.rom
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/output/ramcode.rom	(revision 6404)
+++ /1121s/branch/shutter/yc1089s_fouse_public/output/ramcode.rom	(working copy)
@@ -1,32 +1,33 @@
-c2840018
-c0000051
-c0010122
-c008812b
-c00a02f8
-c00a81bd
-c00c01cb
-c00c818a
-c00d013d
-c012831a
-c013807c
-c05180c4
-c05280fc
-c0530087
-c053809a
-c05500ec
-c05881dd
-c062001f
-c06281d2
-c06d02e1
-c06d840a
-c06e0447
-c06e8428
+c2840019
+c0000052
+c0010129
+c0088132
+c00a02ff
+c00a81c4
+c00c01d2
+c00c8191
+c00d0144
+c0128321
+c013807d
+c05180c5
+c0528103
+c0530088
+c053809b
+c05500ed
+c05583c0
+c05881e4
+c0620020
+c06281d9
+c06d02e8
+c06d841c
+c06e0459
+c06e843a
 2020235a
-c0120055
-c01280d5
-c01300da
-c01c8314
-c0268318
+c0120056
+c01280d6
+c01300db
+c01c831b
+c026831f
 c17f8000
 2020235a
 20406b34
@@ -37,7 +38,7 @@
 18000e00
 793f8022
 a84c0000
-20208049
+2020804a
 6ff08046
 79207e06
 79207e07
@@ -67,24 +68,24 @@
 70804782
 20000001
 afec0000
-20208025
-c5110049
+20208026
+c511004a
 79200022
-20200026
+20200027
 6ff10044
 1fe0fe01
 67f10044
 18e08e01
 28e01e08
-24208025
-c2000022
+24208026
+c2000023
 20206b38
 2435a002
 37d98200
 37d98200
 20202002
 204025c2
-c597805b
+c597805c
 783cfc00
 2000001e
 204025c2
@@ -95,7 +96,7 @@
 78507c00
 19623600
 37c18400
-20370064
+20370065
 1b420400
 604b000f
 242c26fa
@@ -107,7 +108,7 @@
 984fb600
 20406877
 20372677
-20400072
+20400073
 6fe08168
 c301a677
 2055a477
@@ -134,28 +135,28 @@
 1a220400
 2020247d
 18e27e00
-c000808e
-c0030090
-c0038094
-c0040098
-c0048099
+c000808f
+c0030091
+c0038095
+c0040099
+c004809a
 202065a2
-da604ff8
+da604ff4
 20206371
-704fd902
-704fda01
+704fd502
+704fd601
 da604fb8
 20206371
-704fd902
-704fda02
-da604fc6
+704fd502
+704fd602
+da604fc4
 20206371
 20600000
 20600000
 6fe0cec7
 c000e5cf
 20406628
-204000a0
+204000a1
 20740000
 202065cf
 d8e00000
@@ -167,9 +168,9 @@
 207a0000
 684906f1
 9842fc00
-202280ac
+202280ad
 18e08e01
-202000a1
+202000a2
 67e14acf
 20404323
 da604ad1
@@ -181,8 +182,8 @@
 207a0000
 684906f1
 18467c00
-202280b9
-202000b8
+202280ba
+202000b9
 704ec001
 20404325
 da604b0d
@@ -195,10 +196,10 @@
 d8a045fd
 20207ca1
 6fe0cf9f
-243a00ce
+243a00cf
 704c0001
 20404323
-204000d1
+204000d2
 20406561
 20216500
 18e27e00
@@ -206,7 +207,7 @@
 20600000
 18e27e00
 c1808000
-202000c6
+202000c7
 dfe0000a
 98effe00
 da6045fd
@@ -238,17 +239,23 @@
 efe18006
 67e1c397
 c003e704
-c00080f2
+c00080f3
 202066db
 18c08dfe
 efe08006
-c00300f6
+c00300f7
 20600000
-202000f7
+202000f8
 704eaa01
 7049e400
 704eb200
 7049e50a
+202000fd
+6fe14ffa
+67e148d6
+6fe14ffc
+67e14902
+67e1494c
 20600000
 2040654b
 dfe0000a
@@ -263,30 +270,30 @@
 24417806
 1a608c09
 efe08006
-243a010b
+243a0112
 20206547
 704ec001
 2040656b
 20406769
 18e27e00
-c0008115
-c0030117
-c003811b
+c000811c
+c003011e
+c0038122
 da604aae
 dfe00003
 2020655a
-da604ffa
+da604ff5
 20206371
-2040011f
-20400383
-da604fc4
+20400126
+2040038a
+da604fc3
 20206371
-2040011f
-204003a6
-da604fd2
+20400126
+204003ad
+da604fcf
 20206371
-704fd900
-704fda00
+704fd500
+704fd600
 20600000
 20407552
 20407448
@@ -296,7 +303,7 @@
 20402018
 2040310f
 2040248c
-20200122
+20200129
 708a0f60
 708a10aa
 708a127a
@@ -326,14 +333,14 @@
 708a844a
 708a8540
 708a16fe
-20400192
+20400199
 6fe0c436
 205a70d7
-24558139
+24558140
 37d98200
 70813b5f
 6fe0c099
-c008017f
+c0080186
 6fe0c438
 1fe1fe04
 67f08a02
@@ -344,15 +351,15 @@
 67f18a73
 708a8660
 708a8b3b
-20400171
+20400178
 70804300
 70804205
 58557474
 67f18968
 7089606e
-204002b3
-204002de
-2040016b
+204002ba
+204002e5
+20400172
 708a3006
 708a32dd
 708a88e0
@@ -360,7 +367,7 @@
 708a3178
 7041480c
 20406f4e
-202002e0
+202002e7
 20758000
 37d98200
 6fe0c11c
@@ -368,7 +375,7 @@
 37d98200
 20600000
 6fe0c099
-c00c0177
+c00c017e
 6fe0c438
 1fe1fe06
 67f08a02
@@ -391,16 +398,16 @@
 67f18a73
 708a762a
 70890204
-20200158
+2020015f
 6fe0c141
-c005018d
+c0050194
 2020220e
 708a1425
 58a93f3f
 67f18a60
 708a631f
 20600000
-203581b9
+203581c0
 6fe2020d
 207a0000
 37d98200
@@ -442,7 +449,7 @@
 6fe1415b
 207a0000
 67e1020f
-202001a3
+202001aa
 2040686f
 204021ba
 18002a08
@@ -478,26 +485,26 @@
 20407396
 20758000
 204042a3
-204003b9
+204003cb
 70409400
-204001d5
+204001dc
 20406459
 58000001
 67e144f6
 7040a60a
-58000246
+5800024d
 67e143db
-58000223
+5800022a
 67e143dd
-58000238
+5800023f
 67e143df
 580062d3
 67e143d3
-58000201
+58000208
 67e143d5
 58006329
 67e143d7
-58000216
+5800021d
 67e143e3
 58006505
 67e14524
@@ -513,7 +520,7 @@
 202062bd
 20406f35
 7044ecff
-20400206
+2040020d
 2040701b
 2020739a
 6fe0c6ce
@@ -524,32 +531,32 @@
 efe08011
 6848c6cf
 98467c00
-20228211
+20228218
 1fe20400
-20400214
+2040021b
 1a20a201
-c200020b
+c2000212
 20600000
 79200407
 20206edd
-204003ce
-204003bb
+204003e0
+204003cd
 2040676c
 2040675a
-2040021c
+20400223
 202064d9
 da604518
-da40021f
+da400226
 202042e7
 70451c02
 20404325
 2040634e
 2020639e
 1a627e00
-c020022f
-c018822d
-c00a822a
-c00a0229
+c0200236
+c0188234
+c00a8231
+c00a0230
 202064e0
 202064f4
 6fe14512
@@ -562,25 +569,25 @@
 6fe4450a
 207a0000
 20406730
-243a0243
+243a024a
 6fe44f02
 67e442d3
 20202e93
 6fe14398
-c012023b
+c0120242
 20600000
 204078ad
 7044f101
 20406730
 2040432b
-243a0243
+243a024a
 6fe44f02
 67e442d3
 20202e93
 6fe44fb0
 67e442d3
 20202e93
-20400251
+20400258
 d8e00009
 20407cef
 247a0000
@@ -589,10 +596,10 @@
 20407ce1
 78547c00
 2040701b
-2040026b
-20200343
+20400272
+2020034a
 6fe144e9
-c2848256
+c284825d
 d8a045da
 df200023
 20207ca1
@@ -604,7 +611,7 @@
 1c427e00
 98460400
 20628000
-24210262
+24210269
 6fe0c9e5
 98467c00
 20610000
@@ -632,7 +639,7 @@
 67e1068c
 18e27e00
 67e1067a
-20400288
+2040028f
 6fe1068c
 1fe22600
 6fe1067a
@@ -644,7 +651,7 @@
 1fe0a60a
 6fe10678
 1fe27200
-c2000274
+c200027b
 20600000
 1a60a405
 efe20012
@@ -655,34 +662,34 @@
 24417806
 580003e8
 98467c00
-20200292
+20200299
 1a608c04
 efe08006
-20200295
+2020029c
 2040656b
 20406561
 20216500
-204002ab
+204002b2
 18e27e00
-c003029f
-c00382a1
-c00402a3
-c00482aa
+c00302a6
+c00382a8
+c00402aa
+c00482b1
 20206558
 da604fb8
 20206371
-da604fc6
+da604fc4
 20206371
-204002a5
+204002ac
 20206371
-da604fdc
+da604fd8
 20406730
 207a0000
-da604fe2
+da604fde
 20600000
 20600000
 da604a30
-7049e55a
+7049e532
 20406730
 207a0000
 da604b57
@@ -701,7 +708,7 @@
 708ac200
 708ac300
 d8e00006
-204002d0
+204002d7
 2a2ffe0d
 2040211d
 2a4ffe0d
@@ -709,14 +716,14 @@
 d8e00005
 2040211c
 2040211e
-204002d0
+204002d7
 d8a08ac2
 1a31fe00
 20402117
 1a51fe00
 20402117
 18e08fff
-202102c5
+202102cc
 2020214f
 2000003c
 58000f00
@@ -742,7 +749,7 @@
 6fe0c409
 67f080cd
 20000bb8
-204002f1
+204002f8
 708a08c1
 6a40c419
 df200008
@@ -753,7 +760,7 @@
 20600000
 7080cc03
 6ff08129
-c30282f2
+c30282f9
 68590164
 6049440a
 7080cc00
@@ -762,7 +769,7 @@
 708a8d12
 708a8e0a
 6fe0c099
-c0080311
+c0080318
 58005762
 67f10907
 70890103
@@ -773,7 +780,7 @@
 708a8d44
 708a8e0a
 6fe0c099
-c008030e
+c0080315
 58002bb1
 67f10907
 c6978000
@@ -782,10 +789,10 @@
 20600000
 58004189
 67f10907
-2020030a
+20200311
 58008312
 67f10907
-202002ff
+20200306
 6fe0c334
 c1000000
 c001b04a
@@ -797,7 +804,7 @@
 6fe240ad
 9840fe00
 67e240ad
-2040032b
+20400332
 6fe0c0cb
 79207e04
 204023e1
@@ -825,16 +832,16 @@
 efe08011
 e8408013
 98467c00
-2022833e
+20228345
 e7e08013
 37d98200
 1a20a201
 1a60a601
-c2000338
+c200033f
 1a420400
 20600000
 da200000
-684a4fd5
+684a4fd1
 1c422400
 1a427e00
 98467c00
@@ -842,101 +849,101 @@
 1a427e00
 18408440
 98467c00
-24210355
+2421035c
 1a20a201
 1a217e0f
-243a0349
+243a0350
 da200000
-2040035a
+20400361
 1c427e00
-67e24fd5
+67e24fd1
 20600000
 1a227e00
 207a0000
 184085c0
 793f841c
-604a4fd5
-67e0cfd4
-6fe0cfd4
+604a4fd1
+67e0cfd0
+6fe0cfd0
 207a0000
 1fe0ffff
-67e0cfd4
-20400361
-2020035b
-da604fd9
-da400364
+67e0cfd0
+20400368
+20200362
+da604fd5
+da40036b
 202042e0
-6fe0cfda
-c0008368
-c001038b
+6fe0cfd6
+c000836f
+c0010392
 20600000
 20406730
-243a0377
+243a037e
 7049e508
-704fd901
-6fe0cfdb
+704fd501
+6fe0cfd7
 1fe0fe01
-67e0cfdb
+67e0cfd7
 1fe67c5a
-20428383
+2042838a
 da604fc2
-204003ae
+204003b5
 efe1003f
 1fe0fe0a
 e7e10011
 20206371
-204003b6
-6fe0cfdb
+204003bd
+6fe0cfd7
 1fe0fe01
-67e0cfdb
+67e0cfd7
 1fe67c5a
-20428383
+2042838a
 da604fc2
-204003ae
+204003b5
 efe1003f
 1fe0fe12
 e7e10011
 20206371
-704fdb00
-da604fc4
+704fd700
+da604fc3
 20406371
 da604fc2
-204003ae
+204003b5
 58000650
 e7e10011
 20600000
 20406730
-243a039a
+243a03a1
 7049e508
-704fd901
-6fe0cfdb
+704fd501
+6fe0cfd7
 1fe0fe01
-67e0cfdb
+67e0cfd7
 1fe67c3c
-204283a6
-da604fd0
-204003ae
+204283ad
+da604fce
+204003b5
 efe1003f
 1fe0fff6
 e7e10011
 20206371
-204003b6
-6fe0cfdb
+204003bd
+6fe0cfd7
 1fe0fe01
-67e0cfdb
+67e0cfd7
 1fe67c3c
-204283a6
-da604fd0
-204003ae
+204283ad
+da604fce
+204003b5
 efe1003f
 1fe0ffee
 e7e10011
 20206371
-704fdb00
-da604fd2
+704fd700
+da604fcf
 20406371
-da604fd0
-204003ae
+da604fce
+204003b5
 58000700
 e7e10011
 20600000
@@ -949,47 +956,58 @@
 1fe22200
 20600000
 7049e501
-704fd903
+704fd503
+20600000
+704eaa05
+7049e401
+704eb201
+7049e53c
+202003c5
+6fe14ff8
+67e148d6
+6fe14ff6
+67e14902
+67e1494c
 20600000
-704ff001
+704fec01
 20600000
-6fe0cff0
+6fe0cfec
 207a0000
-6fe0cff2
+6fe0cfee
 207a0000
-da604ff6
-da4003c2
+da604ff2
+da4003d4
 202042e0
-704ff605
-6fe0cff7
+704ff205
+6fe0cff3
 79407e00
-67e0cff7
+67e0cff3
 c000c323
 20204325
-6fe0cff1
+6fe0cfed
 1fe0fe01
-67e0cff1
-6848cff5
+67e0cfed
+6848cff1
 98467c00
 20600000
-6fe0cff0
+6fe0cfec
 207a0000
-204003c8
+204003da
 24610000
-704ff100
+704fed00
 70440701
 20406ff3
 20406feb
-20400447
-20400428
-67e14fee
-da204fe8
-204003e0
+20400459
+2040043a
+67e14fea
+da204fe4
+204003f2
 6fe0c40c
-c2808400
-c3000404
-704ff301
-20200402
+c2808412
+c3000416
+704fef01
+20200414
 efe40011
 67e40670
 20406ff3
@@ -1004,11 +1022,11 @@
 6fe10676
 68490670
 98467c00
-202103fc
+2021040e
 68490672
 98467e00
-242103fe
-203a03fe
+24210410
+203a0410
 1fefa264
 6fe10670
 68490672
@@ -1016,21 +1034,21 @@
 1a227e00
 9846fc00
 20407d5f
-67e0cff4
+67e0cff0
 20600000
-704ff464
+704ff064
 20600000
-704ff400
+704ff000
 20600000
 20404325
 20204327
-704ff201
+704fee01
 20600000
-704ff200
-6fe0cff3
+704fee00
+6fe0cfef
 207a0000
 20404325
-704ff300
+704fef00
 20600000
 6fe401fd
 203a6f79
@@ -1063,8 +1081,8 @@
 67f08a0a
 20600000
 6fe0c407
-c000842c
-c0010433
+c000843e
+c0010445
 20600000
 580003e8
 67e14405
@@ -1072,7 +1090,7 @@
 6fe14154
 da600e10
 20406fc0
-20200439
+2020044b
 580003e8
 67e14405
 6849414e
@@ -1084,7 +1102,7 @@
 68494158
 9846fc00
 20207d5f
-2040041b
+2040042d
 6ff08a09
 793ffe07
 67f08a09
@@ -1093,14 +1111,14 @@
 708a0d61
 708a0b00
 20600000
-2040043e
+20400450
 20406f90
 6fe0c409
 67f080cd
 20406f97
 708a0d60
 7080cd00
-2040043e
+20400450
 6fe0c409
 67f080cd
 708a0b50
@@ -1108,7 +1126,7 @@
 df00000b
 6de1440a
 7080cc03
-20400460
+20400472
 68590164
 60494158
 20406f9c
@@ -1119,5 +1137,5 @@
 7080cc00
 20600000
 6ff08129
-c3028460
+c3028472
 20600000
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/output/sched.rom	(revision 6404)
+++ /1121s/branch/shutter/yc1089s_fouse_public/output/sched.rom	(working copy)
@@ -20,7 +20,7 @@
 00   #mem_patch12
 00   #mem_patch13
 e8   #mem_patch14
-04   #mem_patch15
+0c   #mem_patch15
 02   #mem_patch16
 00   #mem_patch17
 30   #mem_patch18
@@ -313,11 +313,15 @@
 ################################### android config  end ######################################
 
 ################################### fouse config ######################################
-mem_fouse_up_press:1d 1e 1f 20 21 22 23 24 25 26
-mem_fouse_up_long_press:27 00
-mem_fouse_up_long_release:28 00
-
-mem_fouse_down_press:26 25 24 23 22 21 20 1f 1e 1d
+mem_fouse_up_press:
+1d 1e 1f 20 21 22 23 24 25 26
+# 08 01 00
+mem_fouse_up_long_press:27
+mem_fouse_up_long_release:28
+
+mem_fouse_down_press:
+26 25 24 23 22 21 20 1f 1e 1d
+# 09 01 00
 mem_fouse_down_long_press:29 00
 mem_fouse_down_long_release:2a 00
 
@@ -326,8 +330,8 @@
 mem_shutter_mode_step_ios_release:
 2d 2e 2f 30 33 34
 
-mem_shutter_dy_vedio_fast_forward_press:35 00
-mem_shutter_dy_vedio_fast_forward_release:36 00
+mem_shutter_dy_vedio_fast_forward_press:35
+mem_shutter_dy_vedio_fast_forward_release:36
 ################################### fouse config  end ######################################
 
 mem_combine_key0_press:01
@@ -438,6 +442,16 @@
 10 00
 2c 01
 
+mem_shutter_ios_set_hid_map:
+09 38
+mem_shutter_ios_Usage:
+09 05
+mem_shutter_android_set_hid_map:
+09 47
+mem_shutter_android_Usage:
+09 04
+
+
 #attribute list: handle 2bytes, uuid 2bytes, length 1bytes, attribute Nbytes
 mem_shutter_le_uuid_sup:
 #Primary service GATT ------
@@ -540,8 +554,8 @@
 30 00 02 00 28 02 0f 18
 
 00 00
-mem_shutter_le_map_len_android:f3 00
-mem_shutter_le_map_len_ios:f3 00
+mem_shutter_le_map_len_android:c3 00
+mem_shutter_le_map_len_ios:c3 00
 mem_shutter_le_hid_map:
 05 0c # Usage Page(Consumer) #legth 30
 09 01 # Usage(Consumer Control)
@@ -558,7 +572,7 @@
 15 00 # Logical Minimum(0)
 25 01 # Logical Maximum(1)
 75 01 # Report Size(1)
-95 08 # Report Count(6)
+95 08 # Report Count(8)
 81 02 #Input (Data, Variable, Absolute)
 c0 #end
 
@@ -602,10 +616,11 @@
 81 02	#Input (Data,Value,Absolute,Bit Field)
 c0		#End Collection
 05 0d	#Usage Page (Digitizer)
-09 05 	# Usage(Touch Screen)
-a1 01 	#Collection (Application)
-09 22   #Usage (finger)
-a1 02  	#Collection (Logical)
+# 09 05 	# Usage(Touch Screen)
+# a1 01 	#Collection (Application)
+# 09 22   #Usage (finger)
+# a1 02  	#Collection (Logical)
+a1 00  	#Collection (Logical)
 09 42	#Usage (Tip Switch)
 15 00	#Logical minimum (0)
 25 01 	#Logical maximum (1)
@@ -641,30 +656,30 @@
 c0		#End Collection
 c0
 
-05 01        #Usage Page (Generic Desktop Ctrls)
-09 06        #Usage (Keyboard)
-A1 01        #Collection (Application)
-85 05        #Report ID (5)
-05 04
-#05 07        #Usage Page (Kbrd/Keypad)
-19 E0        #Usage Minimum (0xE0)
-29 E7        #Usage Maximum (0xE7)
-15 00        #Logical Minimum (0)
-25 01        #Logical Maximum (1)
-75 01        #Report Size (1)
-95 08        #Report Count (8)
-81 02        #Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-75 08        #Report Size (8)
-95 01        #Report Count (1)
-15 00        #Logical Minimum (0)
-25 F4        #Logical Maximum (-12)
-05 04
-#05 07        #Usage Page (Kbrd/Keypad)
-19 00        #Usage Minimum (0x00)
-29 F4        #Usage Maximum (0xF4)
-81 00        #Input (Data,Array,Abs,No Wrap,Linear,Preferred State,No Null Position)
-C0           #End Collection
-c0
+# 05 01        #Usage Page (Generic Desktop Ctrls)
+# 09 06        #Usage (Keyboard)
+# A1 01        #Collection (Application)
+# 85 05        #Report ID (5)
+# 05 04
+# #05 07        #Usage Page (Kbrd/Keypad)
+# 19 E0        #Usage Minimum (0xE0)
+# 29 E7        #Usage Maximum (0xE7)
+# 15 00        #Logical Minimum (0)
+# 25 01        #Logical Maximum (1)
+# 75 01        #Report Size (1)
+# 95 08        #Report Count (8)
+# 81 02        #Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+# 75 08        #Report Size (8)
+# 95 01        #Report Count (1)
+# 15 00        #Logical Minimum (0)
+# 25 F4        #Logical Maximum (-12)
+# 05 04
+# #05 07        #Usage Page (Kbrd/Keypad)
+# 19 00        #Usage Minimum (0x00)
+# 29 F4        #Usage Maximum (0xF4)
+# 81 00        #Input (Data,Array,Abs,No Wrap,Linear,Preferred State,No Null Position)
+# C0           #End Collection
+# c0
 
 # 05 0c # Usage Page(Consumer)
 # 09 01 # Usage(Consumer Control)
Index: program/patch.prog
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/program/patch.prog	(revision 6404)
+++ /1121s/branch/shutter/yc1089s_fouse_public/program/patch.prog	(working copy)
@@ -22,6 +22,7 @@
 	beq patch14_6,p_shutter_dy_keyscan_key_check_long_press
 	beq patch14_7,p_shutter_dy_keyscan_key_process_next
 	beq patch15_2,p_shutter_dy_le_parse_att
+	beq patch15_3,p_shutter_dy_le_remote_iphone
 	beq patch16_1,p_shutter_dy_init
 	beq patch18_4,p_otp_write
 	beq patch18_5,p_otp_read_data
@@ -337,6 +338,14 @@
 	jam 0,mem_iphone_flag
 	jam 0,mem_last_shutter_le_iphone_flag
 	jam 10,mem_send_data_delay
+	branch p_le_hid_map_get_transducer_index_android
+
+p_le_hid_map_get_transducer_index_android:
+	fetch 2,mem_shutter_android_Usage
+	store 2,mem_shutter_le_hid_map+40
+	fetch 2,mem_shutter_android_set_hid_map
+	store 2,mem_shutter_le_hid_map+84
+	store 2,mem_shutter_le_hid_map+158
 	rtn
 
 p_shutter_dy_shutter_key_release:
@@ -925,7 +934,7 @@
 p_shutter_dy_le_get_release_ptr:
 p_shutter_dy_le_get_release_ptr_set:
 	arg mem_key0_release_new,regc
-	jam 90,mem_send_data_delay
+	jam 50,mem_send_data_delay
 	call shutter_dy_check_iphone
 	rtn blank
 	arg mem_key0_release_new_i,regc
@@ -1263,6 +1272,21 @@
 	jam 3,mem_shutter_dy_fouse_time
 	rtn
 
+p_shutter_dy_le_remote_iphone:
+	jam 5,mem_shutter_back_count
+	jam 1,mem_iphone_flag
+	jam 1,mem_last_shutter_le_iphone_flag
+	jam 60,mem_send_data_delay
+	branch p_le_hid_map_get_transducer_index_ios
+
+p_le_hid_map_get_transducer_index_ios:
+	fetch 2,mem_shutter_ios_Usage
+	store 2,mem_shutter_le_hid_map+40
+	fetch 2,mem_shutter_ios_set_hid_map
+	store 2,mem_shutter_le_hid_map+84
+	store 2,mem_shutter_le_hid_map+158
+	rtn
+
 /////////////////////////////////////////////// adc ////////////////////////////////////////
 ifdef ADC_1121SB
 p_shutter_adc_config_init:
Index: sched/shutter_dy.dat
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/sched/shutter_dy.dat	(revision 6404)
+++ /1121s/branch/shutter/yc1089s_fouse_public/sched/shutter_dy.dat	(working copy)
@@ -246,11 +246,15 @@
 ################################### android config  end ######################################
 
 ################################### fouse config ######################################
-mem_fouse_up_press:1d 1e 1f 20 21 22 23 24 25 26
-mem_fouse_up_long_press:27 00
-mem_fouse_up_long_release:28 00
-
-mem_fouse_down_press:26 25 24 23 22 21 20 1f 1e 1d
+mem_fouse_up_press:
+1d 1e 1f 20 21 22 23 24 25 26
+# 08 01 00
+mem_fouse_up_long_press:27
+mem_fouse_up_long_release:28
+
+mem_fouse_down_press:
+26 25 24 23 22 21 20 1f 1e 1d
+# 09 01 00
 mem_fouse_down_long_press:29 00
 mem_fouse_down_long_release:2a 00
 
@@ -259,8 +263,8 @@
 mem_shutter_mode_step_ios_release:
 2d 2e 2f 30 33 34
 
-mem_shutter_dy_vedio_fast_forward_press:35 00
-mem_shutter_dy_vedio_fast_forward_release:36 00
+mem_shutter_dy_vedio_fast_forward_press:35
+mem_shutter_dy_vedio_fast_forward_release:36
 ################################### fouse config  end ######################################
 
 mem_combine_key0_press:01
@@ -371,6 +375,16 @@
 10 00
 2c 01
 
+mem_shutter_ios_set_hid_map:
+09 38
+mem_shutter_ios_Usage:
+09 05
+mem_shutter_android_set_hid_map:
+09 47
+mem_shutter_android_Usage:
+09 04
+
+
 #attribute list: handle 2bytes, uuid 2bytes, length 1bytes, attribute Nbytes
 mem_shutter_le_uuid_sup:
 #Primary service GATT ------
@@ -473,8 +487,8 @@
 30 00 02 00 28 02 0f 18
 
 00 00
-mem_shutter_le_map_len_android:f3 00
-mem_shutter_le_map_len_ios:f3 00
+mem_shutter_le_map_len_android:c3 00
+mem_shutter_le_map_len_ios:c3 00
 mem_shutter_le_hid_map:
 05 0c # Usage Page(Consumer) #legth 30
 09 01 # Usage(Consumer Control)
@@ -491,7 +505,7 @@
 15 00 # Logical Minimum(0)
 25 01 # Logical Maximum(1)
 75 01 # Report Size(1)
-95 08 # Report Count(6)
+95 08 # Report Count(8)
 81 02 #Input (Data, Variable, Absolute)
 c0 #end
 
@@ -535,10 +549,11 @@
 81 02	#Input (Data,Value,Absolute,Bit Field)
 c0		#End Collection
 05 0d	#Usage Page (Digitizer)
-09 05 	# Usage(Touch Screen)
-a1 01 	#Collection (Application)
-09 22   #Usage (finger)
-a1 02  	#Collection (Logical)
+# 09 05 	# Usage(Touch Screen)
+# a1 01 	#Collection (Application)
+# 09 22   #Usage (finger)
+# a1 02  	#Collection (Logical)
+a1 00  	#Collection (Logical)
 09 42	#Usage (Tip Switch)
 15 00	#Logical minimum (0)
 25 01 	#Logical maximum (1)
@@ -574,30 +589,30 @@
 c0		#End Collection
 c0
 
-05 01        #Usage Page (Generic Desktop Ctrls)
-09 06        #Usage (Keyboard)
-A1 01        #Collection (Application)
-85 05        #Report ID (5)
-05 04
-#05 07        #Usage Page (Kbrd/Keypad)
-19 E0        #Usage Minimum (0xE0)
-29 E7        #Usage Maximum (0xE7)
-15 00        #Logical Minimum (0)
-25 01        #Logical Maximum (1)
-75 01        #Report Size (1)
-95 08        #Report Count (8)
-81 02        #Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
-75 08        #Report Size (8)
-95 01        #Report Count (1)
-15 00        #Logical Minimum (0)
-25 F4        #Logical Maximum (-12)
-05 04
-#05 07        #Usage Page (Kbrd/Keypad)
-19 00        #Usage Minimum (0x00)
-29 F4        #Usage Maximum (0xF4)
-81 00        #Input (Data,Array,Abs,No Wrap,Linear,Preferred State,No Null Position)
-C0           #End Collection
-c0
+# 05 01        #Usage Page (Generic Desktop Ctrls)
+# 09 06        #Usage (Keyboard)
+# A1 01        #Collection (Application)
+# 85 05        #Report ID (5)
+# 05 04
+# #05 07        #Usage Page (Kbrd/Keypad)
+# 19 E0        #Usage Minimum (0xE0)
+# 29 E7        #Usage Maximum (0xE7)
+# 15 00        #Logical Minimum (0)
+# 25 01        #Logical Maximum (1)
+# 75 01        #Report Size (1)
+# 95 08        #Report Count (8)
+# 81 02        #Input (Data,Var,Abs,No Wrap,Linear,Preferred State,No Null Position)
+# 75 08        #Report Size (8)
+# 95 01        #Report Count (1)
+# 15 00        #Logical Minimum (0)
+# 25 F4        #Logical Maximum (-12)
+# 05 04
+# #05 07        #Usage Page (Kbrd/Keypad)
+# 19 00        #Usage Minimum (0x00)
+# 29 F4        #Usage Maximum (0xF4)
+# 81 00        #Input (Data,Array,Abs,No Wrap,Linear,Preferred State,No Null Position)
+# C0           #End Collection
+# c0
 
 # 05 0c # Usage Page(Consumer)
 # 09 01 # Usage(Consumer Control)
