Index: format/app_shutter_dy.format
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1305_puclic_fouse/format/app_shutter_dy.format	(revision 6425)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1305_puclic_fouse/format/app_shutter_dy.format	(working copy)
@@ -198,7 +198,7 @@
 1 mem_shutter_fouse_select
 1 mem_shutter_dy_fouse_count
 5 mem_shutter_mode_step_android
-5 mem_shutter_mode_step_ios_release
+5 mem_shutter_mode_step_ios
 1 mem_shutter_photo_time
 1 mem_shutter_photo_click_count
 1 mem_shutter_photo_double_time
Index: output/otp.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1305_puclic_fouse/output/otp.dat	(revision 6425)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1305_puclic_fouse/output/otp.dat	(working copy)
@@ -11,7 +11,7 @@
 00
 aa
 55
-32
+36
 0f
 c2
 84
@@ -32,7 +32,7 @@
 c0
 0a
 02
-f4
+f5
 c0
 0a
 81
@@ -52,7 +52,7 @@
 c0
 12
 83
-16
+17
 c0
 13
 80
@@ -80,7 +80,7 @@
 c0
 55
 83
-c1
+c2
 c0
 58
 81
@@ -96,7 +96,7 @@
 c0
 6d
 02
-dd
+de
 20
 20
 23
@@ -116,11 +116,11 @@
 c0
 1c
 83
-10
+11
 c0
 26
 83
-14
+15
 c1
 7f
 80
@@ -588,7 +588,7 @@
 20
 20
 03
-6f
+70
 70
 4f
 da
@@ -596,7 +596,7 @@
 20
 20
 03
-91
+92
 20
 60
 00
@@ -1004,19 +1004,19 @@
 67
 e1
 48
-d6
+b0
 58
 00
 47
 09
 67
 e1
-49
-02
+48
+dc
 67
 e1
 49
-4c
+26
 20
 60
 00
@@ -1124,7 +1124,7 @@
 20
 40
 03
-89
+8a
 da
 60
 4f
@@ -1140,7 +1140,7 @@
 20
 40
 03
-ab
+ac
 da
 60
 4f
@@ -1412,11 +1412,11 @@
 20
 40
 02
-af
+b0
 20
 40
 02
-da
+db
 20
 40
 01
@@ -1452,7 +1452,7 @@
 20
 20
 02
-dc
+dd
 20
 75
 80
@@ -2328,7 +2328,7 @@
 20
 40
 03
-3f
+40
 20
 40
 02
@@ -2656,7 +2656,7 @@
 20
 40
 02
-a7
+a8
 18
 e2
 7e
@@ -2676,7 +2676,7 @@
 c0
 04
 82
-a6
+a7
 20
 20
 65
@@ -2705,6 +2705,10 @@
 20
 63
 71
+70
+49
+e5
+64
 da
 60
 4f
@@ -2812,7 +2816,7 @@
 20
 40
 02
-cc
+cd
 2a
 2f
 fe
@@ -2844,7 +2848,7 @@
 20
 40
 02
-cc
+cd
 d8
 a0
 8a
@@ -2872,7 +2876,7 @@
 20
 21
 02
-c1
+c2
 20
 20
 21
@@ -2976,7 +2980,7 @@
 20
 40
 02
-ed
+ee
 70
 8a
 08
@@ -3020,7 +3024,7 @@
 c3
 02
 82
-ee
+ef
 68
 59
 01
@@ -3056,7 +3060,7 @@
 c0
 08
 03
-0d
+0e
 58
 00
 57
@@ -3100,7 +3104,7 @@
 c0
 08
 03
-0a
+0b
 58
 00
 2b
@@ -3136,7 +3140,7 @@
 20
 20
 03
-06
+07
 58
 00
 83
@@ -3148,7 +3152,7 @@
 20
 20
 02
-fb
+fc
 6f
 e0
 c3
@@ -3196,7 +3200,7 @@
 20
 40
 03
-27
+28
 6f
 e0
 c0
@@ -3308,7 +3312,7 @@
 20
 22
 83
-3a
+3b
 e7
 e0
 80
@@ -3328,7 +3332,7 @@
 c2
 00
 03
-34
+35
 1a
 42
 04
@@ -3368,7 +3372,7 @@
 24
 3a
 03
-61
+62
 1a
 42
 7e
@@ -3384,7 +3388,7 @@
 24
 21
 03
-53
+54
 1a
 20
 a2
@@ -3396,7 +3400,7 @@
 24
 3a
 03
-45
+46
 da
 20
 00
@@ -3404,7 +3408,7 @@
 20
 40
 03
-5a
+5b
 1c
 42
 7e
@@ -3424,7 +3428,7 @@
 24
 3a
 03
-64
+65
 1a
 22
 7e
@@ -3468,11 +3472,11 @@
 20
 40
 03
-68
+69
 20
 20
 03
-5b
+5c
 1a
 42
 7e
@@ -3484,7 +3488,7 @@
 20
 20
 03
-49
+4a
 1a
 22
 7e
@@ -3500,7 +3504,7 @@
 20
 20
 03
-58
+59
 da
 60
 4f
@@ -3508,7 +3512,7 @@
 da
 40
 03
-6b
+6c
 20
 20
 42
@@ -3520,11 +3524,11 @@
 c0
 00
 83
-6f
+70
 c0
 01
 03
-91
+92
 20
 60
 00
@@ -3536,11 +3540,11 @@
 24
 3a
 03
-7d
+7e
 20
 40
 03
-bb
+bc
 6f
 e0
 cf
@@ -3560,7 +3564,7 @@
 20
 22
 83
-89
+8a
 da
 60
 4f
@@ -3568,7 +3572,7 @@
 20
 40
 03
-b3
+b4
 ef
 e1
 00
@@ -3588,7 +3592,7 @@
 20
 40
 03
-be
+bf
 6f
 e0
 cf
@@ -3608,7 +3612,7 @@
 20
 42
 83
-89
+8a
 da
 60
 4f
@@ -3616,7 +3620,7 @@
 20
 40
 03
-b3
+b4
 ef
 e1
 00
@@ -3652,7 +3656,7 @@
 20
 40
 03
-b3
+b4
 58
 00
 07
@@ -3672,11 +3676,11 @@
 24
 3a
 03
-9f
+a0
 20
 40
 03
-bb
+bc
 6f
 e0
 cf
@@ -3696,7 +3700,7 @@
 20
 22
 83
-ab
+ac
 da
 60
 4f
@@ -3704,7 +3708,7 @@
 20
 40
 03
-b3
+b4
 ef
 e1
 00
@@ -3724,7 +3728,7 @@
 20
 40
 03
-be
+bf
 6f
 e0
 cf
@@ -3744,7 +3748,7 @@
 20
 42
 83
-ab
+ac
 da
 60
 4f
@@ -3752,7 +3756,7 @@
 20
 40
 03
-b3
+b4
 ef
 e1
 00
@@ -3788,7 +3792,7 @@
 20
 40
 03
-b3
+b4
 58
 00
 0a
@@ -3876,7 +3880,7 @@
 20
 20
 03
-c6
+c7
 58
 00
 05
@@ -3884,25 +3888,25 @@
 67
 e1
 48
-d6
+b0
 58
 00
 38
 09
 67
 e1
-49
-02
+48
+dc
 67
 e1
 49
-4c
+26
 20
 60
 00
 00
-32
-70
+61
+4a
 aa
 55
 40
@@ -3993,7 +3997,7 @@
 00
 db
 42
-0d
+0f
 21
 21
 98
@@ -4144,14 +4148,14 @@
 e3
 4e
 0a
-ff
+06
 15
 08
 0a
 14
-ff
-06
 07
+ff
+ff
 0d
 ff
 aa
@@ -4172,7 +4176,7 @@
 00
 aa
 55
-08
+09
 00
 57
 4b
@@ -4183,6 +4187,7 @@
 15
 14
 13
+1c
 00
 aa
 55
@@ -4218,7 +4223,6 @@
 00
 75
 4b
-11
 10
 0f
 0e
@@ -4226,6 +4230,7 @@
 0c
 0b
 0a
+1c
 00
 aa
 55
@@ -4251,7 +4256,6 @@
 00
 93
 4b
-0b
 0c
 0d
 0e
@@ -4259,10 +4263,11 @@
 10
 11
 12
+1c
 00
 aa
 55
-08
+09
 00
 a2
 4b
@@ -4273,6 +4278,7 @@
 18
 19
 1a
+1c
 00
 aa
 55
@@ -4297,7 +4303,7 @@
 00
 aa
 55
-08
+09
 00
 30
 4a
@@ -4308,6 +4314,7 @@
 15
 14
 13
+1c
 00
 aa
 55
@@ -4343,7 +4350,6 @@
 00
 4e
 4a
-11
 10
 0f
 0e
@@ -4351,6 +4357,7 @@
 0c
 0b
 0a
+1c
 00
 aa
 55
@@ -4385,7 +4392,6 @@
 00
 6c
 4a
-0b
 0c
 0d
 0e
@@ -4393,6 +4399,7 @@
 10
 11
 12
+1c
 00
 aa
 55
@@ -4405,7 +4412,7 @@
 00
 aa
 55
-08
+09
 00
 7b
 4a
@@ -4416,6 +4423,7 @@
 18
 19
 1a
+1c
 00
 aa
 55
@@ -4464,9 +4472,9 @@
 00
 dc
 4f
+2b
 02
 01
-2b
 2c
 00
 2d
@@ -4612,7 +4620,7 @@
 02
 1b
 00
-20
+40
 00
 00
 00
@@ -4625,7 +4633,7 @@
 02
 1b
 00
-40
+80
 00
 00
 00
@@ -4638,8 +4646,8 @@
 02
 1b
 00
-80
 00
+01
 00
 00
 00
@@ -4651,133 +4659,133 @@
 0a
 23
 00
-00
+83
 f4
 07
-80
-02
+00
+00
 04
-f4
-07
-80
-02
+00
+00
+00
+00
 0a
 23
 00
 83
 f4
 07
-80
-03
+00
+01
 04
-f4
-07
-80
-03
+00
+00
+00
+00
 0a
 23
 00
 83
 f4
 07
-40
+00
 04
 04
-f4
-07
-40
-04
+00
+00
+00
+00
 0a
 23
 00
 83
 f4
 07
-80
-05
+00
+06
 04
-f4
-07
-80
-05
+00
+00
+00
+00
 0a
 23
 00
 83
 f4
 07
-40
-06
-04
-f4
+00
 07
-40
-06
+04
+00
+00
+00
+00
 0a
 23
 00
 83
 f4
 07
-80
-07
+00
+08
 04
-f4
-07
-80
-07
+00
+00
+00
+00
 0a
 23
 00
 83
 f4
 07
-40
-08
+00
+0c
 04
-f4
-07
-40
-08
+00
+00
+00
+00
 0a
 23
 00
 83
 f4
 07
-80
-09
+00
+0f
 04
-f4
-07
-80
-09
+00
+00
+00
+00
 0a
 23
 00
-00
+83
 f4
 07
-40
-0a
+ff
+0f
 04
-f4
-07
-40
-0a
+00
+00
+00
+00
 0a
 23
 00
-00
+83
 40
 00
 80
 08
 04
-40
 00
-40
-04
+00
+00
+00
 0a
 23
 00
@@ -4787,10 +4795,10 @@
 80
 08
 04
-80
-02
-40
-04
+00
+00
+00
+00
 0a
 23
 00
@@ -4800,23 +4808,23 @@
 80
 08
 04
-40
-05
-40
-04
+00
+00
+00
+00
 0a
 23
 00
 83
 80
 06
-80
+a0
 08
 04
-80
-07
-40
-04
+00
+00
+00
+00
 0a
 23
 00
@@ -4826,23 +4834,23 @@
 80
 08
 04
-40
-09
-40
-04
+00
+00
+00
+00
 0a
 23
 00
 83
 80
 0a
-80
+a0
 08
 04
-80
-0b
-40
-04
+00
+00
+00
+00
 0a
 23
 00
@@ -4852,23 +4860,23 @@
 80
 08
 04
-40
-0d
-40
-04
+00
+00
+00
+00
 0a
 23
 00
-00
+83
 80
-0d
+0e
 80
 08
 04
-80
-0e
-40
-04
+00
+00
+00
+00
 0a
 23
 00
@@ -4878,10 +4886,10 @@
 80
 07
 04
-f0
-07
-80
-07
+00
+00
+00
+00
 0a
 23
 00
@@ -4891,10 +4899,10 @@
 80
 07
 04
-f0
-07
-80
-07
+00
+00
+00
+00
 0a
 23
 00
@@ -5642,55 +5650,17 @@
 00
 d0
 49
-c3
+c5
 00
-c3
+c5
 00
 aa
 55
-c3
+c5
 00
 ae
 48
 05
-0c
-09
-01
-a1
-01
-85
-03
-09
-82
-09
-e9
-09
-ea
-09
-30
-09
-40
-0a
-23
-02
-0a
-2d
-02
-0a
-2e
-02
-15
-00
-25
-01
-75
-01
-95
-08
-81
-02
-c0
-05
 0d
 09
 04
@@ -5847,6 +5817,46 @@
 02
 c0
 c0
+05
+0c
+09
+01
+a1
+01
+85
+03
+09
+82
+09
+e9
+09
+ea
+09
+30
+09
+40
+09
+a0
+0a
+23
+02
+0a
+2d
+02
+0a
+2e
+02
+15
+00
+25
+01
+75
+01
+95
+09
+81
+02
+c0
 aa
 55
 10
@@ -6068,7 +6078,7 @@
 aa
 aa
 55
-4a
-76
-f5
-bc
+81
+62
+ca
+33
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1305_puclic_fouse/output/sched.rom	(revision 6425)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1305_puclic_fouse/output/sched.rom	(working copy)
@@ -70,7 +70,7 @@
 #power on config
 mem_ui_button_gpio:ff
 
-mem_le_lap:0d 21 21 98 07 2a
+mem_le_lap:0f 21 21 98 07 2a
 mem_le_name_len:
 'YC Selfie
 
@@ -130,14 +130,14 @@
 mem_shutter_key_num_conf:0a
 mem_shutter_dy_key_conf:
 #test 9key
-ff   #right
+06   #right
 15   #like
 08   #down
 0a   #photo
 14   #up
-ff   #left
-06   #fouse up
-07   #fouse down
+07   #left
+ff   #fouse up
+ff   #fouse down
 0d   #mode step
 ff   #photo2
 
@@ -163,7 +163,7 @@
 ################################### ios config ######################################
 #right
 mem_key0_release_new_i:
-19 18 17 16 15 14 13 00
+19 18 17 16 15 14 13 1c 00
 mem_key0_long_press_i:
 00
 #like
@@ -173,7 +173,7 @@
 1b 1c 1c 1b 1c 00
 #down
 mem_key2_release_new_i:
-11 10 0f 0e 0d 0c 0b 0a 00
+10 0f 0e 0d 0c 0b 0a 1c 00
 #photo
 mem_key3_release_new_i:#volume increment
 03 01 00
@@ -181,10 +181,10 @@
 04 01 00
 #up
 mem_key4_release_new_i:
-0b 0c 0d 0e 0f 10 11 12 00
+0c 0d 0e 0f 10 11 12 1c 00
 #left
 mem_key5_release_new_i:
-14 15 16 17 18 19 1a 00
+14 15 16 17 18 19 1a 1c 00
 mem_key5_long_press_i: #lock
 00
 #move
@@ -198,7 +198,7 @@
 00
 #right
 mem_key0_release_new:
-19 18 17 16 15 14 13 00
+19 18 17 16 15 14 13 1c 00
 mem_key0_long_press:
 00
 #like
@@ -208,7 +208,7 @@
 1b 1c 1c 1b 1c 00
 #down
 mem_key2_release_new:
-11 10 0f 0e 0d 0c 0b 0a 00
+10 0f 0e 0d 0c 0b 0a 1c 00
 mem_key2_long_press:#volume decrement
 04 01 00
 #photo
@@ -218,12 +218,12 @@
 04 01 00
 #up
 mem_key4_release_new:
-0b 0c 0d 0e 0f 10 11 12 00
+0c 0d 0e 0f 10 11 12 1c 00
 mem_key4_long_press:#volume increment
 03 01 00
 #left
 mem_key5_release_new:
-14 15 16 17 18 19 1a 00
+14 15 16 17 18 19 1a 1c 00
 mem_key5_long_press:
 00
 ################################### android config  end ######################################
@@ -237,8 +237,8 @@
 mem_fouse_down_long_press:29 00
 mem_fouse_down_long_release:2a 00
 
-mem_shutter_mode_step_android:02 01 2b 2c 00
-mem_shutter_mode_step_ios_release:2d 2e 2f 30 00
+mem_shutter_mode_step_android:2b 02 01 2c 00
+mem_shutter_mode_step_ios:2d 2e 2f 30 00
 
 ################################### fouse config  end ######################################
 
@@ -261,31 +261,31 @@
 02 1b 00 04 00 00 00 00 00 00 00 00 00 #4  volume down
 02 1b 00 08 00 00 00 00 00 00 00 00 00 #5  lock
 02 1b 00 10 00 00 00 00 00 00 00 00 00 #6  ios home
-02 1b 00 20 00 00 00 00 00 00 00 00 00 #7  android home
-02 1b 00 40 00 00 00 00 00 00 00 00 00 #8  zoom in
-02 1b 00 80 00 00 00 00 00 00 00 00 00 #9  zoom out
+02 1b 00 40 00 00 00 00 00 00 00 00 00 #7  android home
+02 1b 00 80 00 00 00 00 00 00 00 00 00 #8  zoom in
+02 1b 00 00 01 00 00 00 00 00 00 00 00 #9  zoom out
 #up and down
-0a 23 00 00 f4 07 80 02 04 f4 07 80 02 #a
-0a 23 00 83 f4 07 80 03 04 f4 07 80 03 #b
-0a 23 00 83 f4 07 40 04 04 f4 07 40 04 #c
-0a 23 00 83 f4 07 80 05 04 f4 07 80 05 #d
-0a 23 00 83 f4 07 40 06 04 f4 07 40 06 #e
-0a 23 00 83 f4 07 80 07 04 f4 07 80 07 #f
-0a 23 00 83 f4 07 40 08 04 f4 07 40 08 #10
-0a 23 00 83 f4 07 80 09 04 f4 07 80 09 #11
-0a 23 00 00 f4 07 40 0a 04 f4 07 40 0a #12
+0a 23 00 83 f4 07 00 00 04 00 00 00 00 #a
+0a 23 00 83 f4 07 00 01 04 00 00 00 00 #b
+0a 23 00 83 f4 07 00 04 04 00 00 00 00 #c
+0a 23 00 83 f4 07 00 06 04 00 00 00 00 #d
+0a 23 00 83 f4 07 00 07 04 00 00 00 00 #e
+0a 23 00 83 f4 07 00 08 04 00 00 00 00 #f
+0a 23 00 83 f4 07 00 0c 04 00 00 00 00 #10
+0a 23 00 83 f4 07 00 0f 04 00 00 00 00 #11
+0a 23 00 83 f4 07 ff 0f 04 00 00 00 00 #12
 #right and left
-0a 23 00 00 40 00 80 08 04 40 00 40 04 #13
-0a 23 00 83 80 02 80 08 04 80 02 40 04 #14
-0a 23 00 83 40 04 80 08 04 40 05 40 04 #15
-0a 23 00 83 80 06 80 08 04 80 07 40 04 #16
-0a 23 00 83 40 08 80 08 04 40 09 40 04 #17
-0a 23 00 83 80 0a 80 08 04 80 0b 40 04 #18
-0a 23 00 83 40 0c 80 08 04 40 0d 40 04 #19
-0a 23 00 00 80 0d 80 08 04 80 0e 40 04 #1a
+0a 23 00 83 40 00 80 08 04 00 00 00 00 #13
+0a 23 00 83 80 02 80 08 04 00 00 00 00 #14
+0a 23 00 83 40 04 80 08 04 00 00 00 00 #15
+0a 23 00 83 80 06 a0 08 04 00 00 00 00 #16
+0a 23 00 83 40 08 80 08 04 00 00 00 00 #17
+0a 23 00 83 80 0a a0 08 04 00 00 00 00 #18
+0a 23 00 83 40 0c 80 08 04 00 00 00 00 #19
+0a 23 00 83 80 0e 80 08 04 00 00 00 00 #1a
 #like
-0a 23 00 83 f0 07 80 07 04 f0 07 80 07 #1b
-0a 23 00 00 f0 07 80 07 04 f0 07 80 07 #1c
+0a 23 00 83 f0 07 80 07 04 00 00 00 00 #1b
+0a 23 00 00 f0 07 80 07 04 00 00 00 00 #1c
 #fouse
 0a 23 00 00 00 07 a0 08 04 00 07 00 03 #1d
 0a 23 00 83 00 07 40 08 87 00 07 00 03 #1e
@@ -437,28 +437,9 @@
 30 00 02 00 28 02 0f 18
 
 00 00
-mem_shutter_le_map_len_android:c3 00
-mem_shutter_le_map_len_ios:c3 00
+mem_shutter_le_map_len_android:c5 00
+mem_shutter_le_map_len_ios:c5 00
 mem_shutter_le_hid_map:
-05 0c # Usage Page(Consumer) #legth 30
-09 01 # Usage(Consumer Control)
-a1 01 # Collection(Application)
-85 03 # Report ID(3)
-09 82 #Mode Step 前/后摄像头切换
-09 e9 # volume up
-09 ea # volume down
-09 30 # lock
-09 40 # home
-0a 23 02  #home
-0a 2d 02 #zoom in
-0a 2e 02 #zoom out
-15 00 # Logical Minimum(0)
-25 01 # Logical Maximum(1)
-75 01 # Report Size(1)
-95 08 # Report Count(6)
-81 02 #Input (Data, Variable, Absolute)
-c0 #end
-
 05 0d	#Usage Page (Digitizer)
 09 04 	# Usage(Touch Screen)
 a1 01 	#Collection (Application)
@@ -535,6 +516,28 @@
 c0		#End Collection
 c0
 
+05 0c # Usage Page(Consumer) #legth 30
+09 01 # Usage(Consumer Control)
+a1 01 # Collection(Application)
+85 03 # Report ID(3)
+09 82 #Mode Step 前/后摄像头切换
+09 e9 # volume up
+09 ea # volume down
+09 30 # lock
+09 40 # home
+09 a0 #plus
+0a 23 02  #home
+0a 2d 02 #zoom in
+0a 2e 02 #zoom out
+15 00 # Logical Minimum(0)
+25 01 # Logical Maximum(1)
+75 01 # Report Size(1)
+95 09 # Report Count(9)
+81 02 #Input (Data, Variable, Absolute)
+c0 #end
+
+
+
 # 05 01        #Usage Page (Generic Desktop Ctrls)
 # 09 06        #Usage (Keyboard)
 # A1 01        #Collection (Application)
Index: program/patch.prog
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1305_puclic_fouse/program/patch.prog	(revision 6425)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1305_puclic_fouse/program/patch.prog	(working copy)
@@ -328,10 +328,10 @@
 
 p_le_hid_map_get_transducer_index_android:
 	setarg 0x0409
-	store 2,mem_shutter_le_hid_map+40
+	store 2,mem_shutter_le_hid_map+2
 	setarg 0x4709
-	store 2,mem_shutter_le_hid_map+84
-	store 2,mem_shutter_le_hid_map+158
+	store 2,mem_shutter_le_hid_map+46
+	store 2,mem_shutter_le_hid_map+120
 	rtn
 
 
@@ -904,11 +904,11 @@
 	branch push_buffer_in_queue
 
 p_shutter_mode_step_ptr:
+	jam 100,mem_send_data_delay
 	arg mem_shutter_mode_step_android,regc
 	call shutter_dy_check_iphone
 	rtn blank
-	arg mem_shutter_mode_step_ios_release,regc
-	//arg mem_key6_release_new_i,regc
+	arg mem_shutter_mode_step_ios,regc
 	rtn
 
 p_shutter_fun3_key_release:
@@ -1649,9 +1649,9 @@
 
 p_le_hid_map_get_transducer_index_ios:
 	setarg 0x0509
-	store 2,mem_shutter_le_hid_map+40
+	store 2,mem_shutter_le_hid_map+2
 	setarg 0x3809
-	store 2,mem_shutter_le_hid_map+84
-	store 2,mem_shutter_le_hid_map+158
+	store 2,mem_shutter_le_hid_map+46
+	store 2,mem_shutter_le_hid_map+120
 	rtn
 
Index: sched/shutter_dy.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1305_puclic_fouse/sched/shutter_dy.dat	(revision 6425)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1305_puclic_fouse/sched/shutter_dy.dat	(working copy)
@@ -3,7 +3,7 @@
 #power on config
 mem_ui_button_gpio:ff
 
-mem_le_lap:0d 21 21 98 07 2a
+mem_le_lap:0f 21 21 98 07 2a
 mem_le_name_len:
 'YC Selfie
 
@@ -63,14 +63,14 @@
 mem_shutter_key_num_conf:0a
 mem_shutter_dy_key_conf:
 #test 9key
-ff   #right
+06   #right
 15   #like
 08   #down
 0a   #photo
 14   #up
-ff   #left
-06   #fouse up
-07   #fouse down
+07   #left
+ff   #fouse up
+ff   #fouse down
 0d   #mode step
 ff   #photo2
 
@@ -96,7 +96,7 @@
 ################################### ios config ######################################
 #right
 mem_key0_release_new_i:
-19 18 17 16 15 14 13 00
+19 18 17 16 15 14 13 1c 00
 mem_key0_long_press_i:
 00
 #like
@@ -106,7 +106,7 @@
 1b 1c 1c 1b 1c 00
 #down
 mem_key2_release_new_i:
-11 10 0f 0e 0d 0c 0b 0a 00
+10 0f 0e 0d 0c 0b 0a 1c 00
 #photo
 mem_key3_release_new_i:#volume increment
 03 01 00
@@ -114,10 +114,10 @@
 04 01 00
 #up
 mem_key4_release_new_i:
-0b 0c 0d 0e 0f 10 11 12 00
+0c 0d 0e 0f 10 11 12 1c 00
 #left
 mem_key5_release_new_i:
-14 15 16 17 18 19 1a 00
+14 15 16 17 18 19 1a 1c 00
 mem_key5_long_press_i: #lock
 00
 #move
@@ -131,7 +131,7 @@
 00
 #right
 mem_key0_release_new:
-19 18 17 16 15 14 13 00
+19 18 17 16 15 14 13 1c 00
 mem_key0_long_press:
 00
 #like
@@ -141,7 +141,7 @@
 1b 1c 1c 1b 1c 00
 #down
 mem_key2_release_new:
-11 10 0f 0e 0d 0c 0b 0a 00
+10 0f 0e 0d 0c 0b 0a 1c 00
 mem_key2_long_press:#volume decrement
 04 01 00
 #photo
@@ -151,12 +151,12 @@
 04 01 00
 #up
 mem_key4_release_new:
-0b 0c 0d 0e 0f 10 11 12 00
+0c 0d 0e 0f 10 11 12 1c 00
 mem_key4_long_press:#volume increment
 03 01 00
 #left
 mem_key5_release_new:
-14 15 16 17 18 19 1a 00
+14 15 16 17 18 19 1a 1c 00
 mem_key5_long_press:
 00
 ################################### android config  end ######################################
@@ -170,8 +170,8 @@
 mem_fouse_down_long_press:29 00
 mem_fouse_down_long_release:2a 00
 
-mem_shutter_mode_step_android:02 01 2b 2c 00
-mem_shutter_mode_step_ios_release:2d 2e 2f 30 00
+mem_shutter_mode_step_android:2b 02 01 2c 00
+mem_shutter_mode_step_ios:2d 2e 2f 30 00
 
 ################################### fouse config  end ######################################
 
@@ -194,31 +194,31 @@
 02 1b 00 04 00 00 00 00 00 00 00 00 00 #4  volume down
 02 1b 00 08 00 00 00 00 00 00 00 00 00 #5  lock
 02 1b 00 10 00 00 00 00 00 00 00 00 00 #6  ios home
-02 1b 00 20 00 00 00 00 00 00 00 00 00 #7  android home
-02 1b 00 40 00 00 00 00 00 00 00 00 00 #8  zoom in
-02 1b 00 80 00 00 00 00 00 00 00 00 00 #9  zoom out
+02 1b 00 40 00 00 00 00 00 00 00 00 00 #7  android home
+02 1b 00 80 00 00 00 00 00 00 00 00 00 #8  zoom in
+02 1b 00 00 01 00 00 00 00 00 00 00 00 #9  zoom out
 #up and down
-0a 23 00 00 f4 07 80 02 04 f4 07 80 02 #a
-0a 23 00 83 f4 07 80 03 04 f4 07 80 03 #b
-0a 23 00 83 f4 07 40 04 04 f4 07 40 04 #c
-0a 23 00 83 f4 07 80 05 04 f4 07 80 05 #d
-0a 23 00 83 f4 07 40 06 04 f4 07 40 06 #e
-0a 23 00 83 f4 07 80 07 04 f4 07 80 07 #f
-0a 23 00 83 f4 07 40 08 04 f4 07 40 08 #10
-0a 23 00 83 f4 07 80 09 04 f4 07 80 09 #11
-0a 23 00 00 f4 07 40 0a 04 f4 07 40 0a #12
+0a 23 00 83 f4 07 00 00 04 00 00 00 00 #a
+0a 23 00 83 f4 07 00 01 04 00 00 00 00 #b
+0a 23 00 83 f4 07 00 04 04 00 00 00 00 #c
+0a 23 00 83 f4 07 00 06 04 00 00 00 00 #d
+0a 23 00 83 f4 07 00 07 04 00 00 00 00 #e
+0a 23 00 83 f4 07 00 08 04 00 00 00 00 #f
+0a 23 00 83 f4 07 00 0c 04 00 00 00 00 #10
+0a 23 00 83 f4 07 00 0f 04 00 00 00 00 #11
+0a 23 00 83 f4 07 ff 0f 04 00 00 00 00 #12
 #right and left
-0a 23 00 00 40 00 80 08 04 40 00 40 04 #13
-0a 23 00 83 80 02 80 08 04 80 02 40 04 #14
-0a 23 00 83 40 04 80 08 04 40 05 40 04 #15
-0a 23 00 83 80 06 80 08 04 80 07 40 04 #16
-0a 23 00 83 40 08 80 08 04 40 09 40 04 #17
-0a 23 00 83 80 0a 80 08 04 80 0b 40 04 #18
-0a 23 00 83 40 0c 80 08 04 40 0d 40 04 #19
-0a 23 00 00 80 0d 80 08 04 80 0e 40 04 #1a
+0a 23 00 83 40 00 80 08 04 00 00 00 00 #13
+0a 23 00 83 80 02 80 08 04 00 00 00 00 #14
+0a 23 00 83 40 04 80 08 04 00 00 00 00 #15
+0a 23 00 83 80 06 a0 08 04 00 00 00 00 #16
+0a 23 00 83 40 08 80 08 04 00 00 00 00 #17
+0a 23 00 83 80 0a a0 08 04 00 00 00 00 #18
+0a 23 00 83 40 0c 80 08 04 00 00 00 00 #19
+0a 23 00 83 80 0e 80 08 04 00 00 00 00 #1a
 #like
-0a 23 00 83 f0 07 80 07 04 f0 07 80 07 #1b
-0a 23 00 00 f0 07 80 07 04 f0 07 80 07 #1c
+0a 23 00 83 f0 07 80 07 04 00 00 00 00 #1b
+0a 23 00 00 f0 07 80 07 04 00 00 00 00 #1c
 #fouse
 0a 23 00 00 00 07 a0 08 04 00 07 00 03 #1d
 0a 23 00 83 00 07 40 08 87 00 07 00 03 #1e
@@ -370,28 +370,9 @@
 30 00 02 00 28 02 0f 18
 
 00 00
-mem_shutter_le_map_len_android:c3 00
-mem_shutter_le_map_len_ios:c3 00
+mem_shutter_le_map_len_android:c5 00
+mem_shutter_le_map_len_ios:c5 00
 mem_shutter_le_hid_map:
-05 0c # Usage Page(Consumer) #legth 30
-09 01 # Usage(Consumer Control)
-a1 01 # Collection(Application)
-85 03 # Report ID(3)
-09 82 #Mode Step 前/后摄像头切换
-09 e9 # volume up
-09 ea # volume down
-09 30 # lock
-09 40 # home
-0a 23 02  #home
-0a 2d 02 #zoom in
-0a 2e 02 #zoom out
-15 00 # Logical Minimum(0)
-25 01 # Logical Maximum(1)
-75 01 # Report Size(1)
-95 08 # Report Count(6)
-81 02 #Input (Data, Variable, Absolute)
-c0 #end
-
 05 0d	#Usage Page (Digitizer)
 09 04 	# Usage(Touch Screen)
 a1 01 	#Collection (Application)
@@ -468,6 +449,28 @@
 c0		#End Collection
 c0
 
+05 0c # Usage Page(Consumer) #legth 30
+09 01 # Usage(Consumer Control)
+a1 01 # Collection(Application)
+85 03 # Report ID(3)
+09 82 #Mode Step 前/后摄像头切换
+09 e9 # volume up
+09 ea # volume down
+09 30 # lock
+09 40 # home
+09 a0 #plus
+0a 23 02  #home
+0a 2d 02 #zoom in
+0a 2e 02 #zoom out
+15 00 # Logical Minimum(0)
+25 01 # Logical Maximum(1)
+75 01 # Report Size(1)
+95 09 # Report Count(9)
+81 02 #Input (Data, Variable, Absolute)
+c0 #end
+
+
+
 # 05 01        #Usage Page (Generic Desktop Ctrls)
 # 09 06        #Usage (Keyboard)
 # A1 01        #Collection (Application)
