Index: do.bat
===================================================================
--- /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/do.bat	(revision 6309)
+++ /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/do.bat	(working copy)
@@ -81,7 +81,7 @@
 perl ../util/mergepatch.pl mouse_ble_att_list usb_kbdata_vendor_define usb_kbdata usb_msdata usb_devicedata usb_confdata ble_shutter_gatt_list ble_shutter_key_value_list ble_car_att_list sha256 
 perl ../util/romcrc.pl romcode.rom
 perl  ../util/mergepatch.pl otp
-perl  ../util/otpcheck.pl
+
 
 if "%device_option%" equ "shutter_dy" (
 cd ..\output
Index: format/app_shutter_dy.format
===================================================================
--- /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/format/app_shutter_dy.format	(revision 6309)
+++ /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/format/app_shutter_dy.format	(working copy)
@@ -208,7 +208,9 @@
 6 mem_shutter_iphone_down_drag_mid
 6 mem_key2_long_press_i_drag
 2 mem_dy_ios_release
-// 8 mem_ble_shutter_dy_interval_min_new_drag
+1 mem_shutter_move_timer
+1 mem_shutter_move_state
+1 mem_shutter_move_cancle_flag
 
 0 mem_shutter_dy_end
 )
Index: output/otp.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/output/otp.dat	(revision 6309)
+++ /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/output/otp.dat	(working copy)
@@ -11,8 +11,8 @@
 00
 aa
 55
-c6
-11
+7e
+10
 c2
 84
 00
@@ -23,36 +23,36 @@
 1d
 c0
 01
-01
-e1
+02
+03
 c0
 08
-81
-ea
+82
+0c
 c0
 0a
-04
-26
+03
+d4
 c0
 0a
 82
-7c
+9e
 c0
 0c
 02
-8a
+ac
 c0
 0c
 82
-49
+6b
 c0
 0d
-01
-fc
+02
+1e
 c0
 12
-84
-48
+83
+f6
 c0
 13
 80
@@ -60,11 +60,11 @@
 c0
 51
 80
-84
+9d
 c0
 52
 81
-c2
+e3
 c0
 53
 00
@@ -72,31 +72,31 @@
 c0
 53
 80
-5f
+78
 c0
 55
 01
-b1
+d2
 c0
 56
 80
-a0
+bf
 c0
 58
 82
-94
+b6
 c0
 62
 82
-91
+b3
 c0
 6d
 03
-f7
+a5
 c0
 6e
-04
-07
+03
+b5
 20
 20
 23
@@ -108,19 +108,19 @@
 c0
 12
 81
-9a
+bb
 c0
 13
 01
-9f
+c0
 c0
 1c
-84
-42
+83
+f0
 c0
 26
-84
-46
+83
+f4
 c1
 7f
 80
@@ -345,50 +345,150 @@
 20
 24
 7d
-20
-40
-00
-59
-c1
-83
-00
-00
 6f
 e0
 ce
-c7
-c0
+c9
+24
+3a
 00
 65
-a2
+18
+e2
+7e
+00
+c0
+01
+67
+65
+c0
+02
+67
+61
 c0
 00
-e5
-a5
+e7
+77
+c0
+00
+00
+5c
+c0
+02
+80
+63
+20
+60
+00
+00
+20
+40
+00
+5e
+20
+20
+63
+71
+da
+60
+4a
+99
+20
+40
+67
+30
+20
+7a
+00
+00
+da
+60
+4b
+c0
 20
 60
 00
 00
+da
+60
+4a
+a8
+20
+20
+63
+71
 18
 e2
 7e
 00
 c0
 02
-e7
-65
+00
+6c
 c0
+01
 00
-67
-61
+6f
+c0
+00
+00
+72
 c0
 02
-02
-d0
+80
+75
 c0
+00
+e7
+77
+20
+60
+00
+00
+70
+4f
+e5
 01
-03
-10
+70
+4f
+e6
+04
+20
+60
+00
+00
+70
+4f
+e5
+01
+70
+4f
+e6
+02
+20
+60
+00
+00
+70
+4f
+e5
+01
+70
+4f
+e6
+00
+20
+60
+00
+00
+70
+4f
+e5
+01
+70
+4f
+e6
+05
 20
 60
 00
@@ -408,7 +508,7 @@
 20
 40
 00
-65
+7e
 20
 74
 00
@@ -456,7 +556,7 @@
 20
 22
 80
-71
+8a
 18
 e0
 8e
@@ -464,7 +564,7 @@
 20
 20
 00
-66
+7f
 67
 e1
 4a
@@ -492,7 +592,7 @@
 20
 40
 00
-a9
+c8
 20
 20
 66
@@ -516,11 +616,11 @@
 20
 22
 80
-7f
+98
 20
 20
 00
-7e
+97
 70
 4e
 c0
@@ -536,7 +636,7 @@
 20
 40
 00
-a9
+c8
 20
 20
 66
@@ -553,8 +653,12 @@
 4c
 00
 01
+6f
+e0
+ce
+c9
 20
-40
+5a
 43
 23
 20
@@ -584,15 +688,11 @@
 24
 42
 81
-94
-6f
-e0
-ce
-c9
-24
-5a
-01
-8e
+b5
+20
+40
+00
+b2
 18
 e2
 7e
@@ -612,7 +712,7 @@
 20
 22
 80
-99
+b8
 6f
 e0
 ce
@@ -620,39 +720,63 @@
 24
 3a
 00
-9b
+ba
 20
 20
 65
 1c
-70
-4e
-c6
-01
-20
-20
-00
-ad
-20
-40
-67
-7f
 18
 e2
 7e
 00
-c0
+c1
+83
 00
-e5
+00
+6f
+e0
+ce
+c9
+79
+40
+7e
+00
+67
+e0
+ce
+c9
+20
+60
+00
+00
+70
+4e
+c6
+01
+20
+20
+00
+cc
+20
+40
+67
+7f
+18
+e2
+7e
+00
+c0
+00
+e5
 1c
 20
 40
 00
-b2
+d1
 20
 20
 00
-ad
+cc
 20
 40
 68
@@ -664,7 +788,7 @@
 20
 3a
 00
-a4
+c3
 20
 20
 68
@@ -704,11 +828,11 @@
 20
 40
 00
-b2
+d1
 20
 40
-00
-f5
+01
+14
 20
 40
 67
@@ -716,7 +840,7 @@
 24
 3a
 00
-c4
+e3
 df
 e0
 00
@@ -732,11 +856,11 @@
 c0
 00
 80
-b6
+d5
 c0
 00
 00
-bc
+db
 20
 60
 00
@@ -747,20 +871,20 @@
 00
 c0
 02
-80
-ff
+81
+1e
 c0
 00
 01
-10
+2f
 c0
 02
 01
-18
+37
 c0
 01
 01
-36
+55
 20
 60
 00
@@ -771,24 +895,24 @@
 13
 c0
 00
-80
-ff
+81
+1e
 c0
 01
 01
-10
+2f
 c0
 01
 81
-18
+37
 c0
 02
 01
-36
+55
 c0
 02
 80
-c3
+e2
 20
 60
 00
@@ -796,19 +920,19 @@
 20
 20
 01
-77
+96
 20
 40
 00
-cc
+eb
 20
 40
+01
 00
-e1
 20
 40
-00
-eb
+01
+0a
 df
 e0
 00
@@ -832,7 +956,7 @@
 20
 40
 00
-d7
+f6
 18
 42
 7e
@@ -872,7 +996,7 @@
 20
 20
 00
-d0
+ef
 68
 48
 ce
@@ -951,8 +1075,8 @@
 00
 20
 20
-00
-e4
+01
+03
 6f
 e0
 ce
@@ -991,8 +1115,8 @@
 00
 20
 20
-00
-ee
+01
+0d
 6f
 e0
 ce
@@ -1008,7 +1132,7 @@
 20
 20
 01
-06
+25
 6f
 e0
 ce
@@ -1036,7 +1160,7 @@
 20
 40
 01
-56
+75
 6f
 e1
 4e
@@ -1047,8 +1171,8 @@
 00
 24
 41
-00
-f9
+01
+18
 24
 61
 00
@@ -1068,7 +1192,7 @@
 20
 3a
 01
-66
+85
 6f
 e1
 4e
@@ -1096,11 +1220,11 @@
 20
 40
 01
-6d
+8c
 20
 20
 01
-77
+96
 20
 40
 67
@@ -1108,11 +1232,11 @@
 24
 5a
 01
-5b
+7a
 20
 40
 01
-56
+75
 6f
 e1
 4e
@@ -1132,7 +1256,7 @@
 20
 20
 01
-05
+24
 20
 40
 67
@@ -1140,11 +1264,11 @@
 20
 3a
 01
-2f
+4e
 20
 40
 01
-56
+75
 6f
 e1
 4e
@@ -1180,7 +1304,7 @@
 24
 21
 01
-06
+25
 58
 00
 0f
@@ -1200,7 +1324,7 @@
 20
 22
 81
-2c
+4b
 18
 40
 84
@@ -1212,7 +1336,7 @@
 20
 20
 01
-4f
+6e
 70
 4e
 ad
@@ -1224,11 +1348,11 @@
 20
 20
 01
-4f
+6e
 20
 40
 01
-56
+75
 6f
 e1
 4e
@@ -1252,7 +1376,7 @@
 20
 20
 01
-06
+25
 20
 40
 67
@@ -1260,11 +1384,11 @@
 20
 3a
 01
-3f
+5e
 20
 40
 01
-56
+75
 6f
 e1
 4e
@@ -1284,15 +1408,15 @@
 20
 21
 01
-45
+64
 20
 20
 01
-4f
+6e
 20
 40
 01
-56
+75
 6f
 e1
 4e
@@ -1312,7 +1436,7 @@
 20
 20
 01
-4f
+6e
 20
 40
 67
@@ -1320,7 +1444,7 @@
 20
 3a
 01
-51
+70
 6f
 e0
 ce
@@ -1328,7 +1452,7 @@
 20
 3a
 01
-51
+70
 1f
 e0
 ff
@@ -1360,7 +1484,7 @@
 20
 20
 01
-06
+25
 58
 00
 0f
@@ -1368,7 +1492,7 @@
 20
 20
 01
-4f
+6e
 70
 4e
 ac
@@ -1380,7 +1504,7 @@
 20
 20
 01
-05
+24
 d8
 40
 00
@@ -1432,7 +1556,7 @@
 20
 22
 81
-53
+72
 18
 40
 84
@@ -1444,7 +1568,7 @@
 20
 20
 01
-05
+24
 6f
 e1
 4e
@@ -1468,11 +1592,11 @@
 20
 40
 01
-6d
+8c
 20
 20
 01
-77
+96
 20
 40
 67
@@ -1480,7 +1604,7 @@
 24
 3a
 01
-81
+a0
 58
 00
 00
@@ -1520,7 +1644,7 @@
 24
 3a
 01
-81
+a0
 58
 00
 00
@@ -1605,6 +1729,10 @@
 60
 00
 00
+70
+4f
+e7
+01
 18
 e2
 7e
@@ -1612,7 +1740,11 @@
 c0
 03
 01
-91
+b2
+c0
+00
+81
+b2
 20
 60
 00
@@ -1636,7 +1768,7 @@
 20
 3a
 01
-97
+b8
 20
 20
 65
@@ -1764,7 +1896,7 @@
 c0
 00
 81
-b7
+d8
 20
 20
 66
@@ -1780,7 +1912,7 @@
 c0
 03
 01
-bb
+dc
 20
 60
 00
@@ -1788,7 +1920,7 @@
 20
 40
 01
-bd
+de
 20
 20
 67
@@ -1872,7 +2004,7 @@
 24
 3a
 01
-d2
+f3
 20
 20
 65
@@ -1888,7 +2020,7 @@
 20
 40
 01
-dd
+fe
 da
 60
 4a
@@ -1921,10 +2053,14 @@
 60
 00
 00
-20
-40
-01
-d8
+70
+4f
+e5
+00
+70
+4f
+e6
+ff
 70
 4b
 fe
@@ -1971,8 +2107,8 @@
 8c
 20
 20
-01
-e1
+02
+03
 70
 8a
 0f
@@ -2092,7 +2228,7 @@
 20
 40
 02
-51
+73
 6f
 e0
 c4
@@ -2103,8 +2239,8 @@
 d7
 24
 55
-81
-f8
+82
+1a
 37
 d9
 82
@@ -2120,7 +2256,7 @@
 c0
 08
 02
-3e
+60
 6f
 e0
 c4
@@ -2164,7 +2300,7 @@
 20
 40
 02
-30
+52
 70
 80
 43
@@ -2188,15 +2324,15 @@
 20
 40
 03
-c9
+77
 20
 40
 03
-f4
+a2
 20
 40
 02
-2a
+4c
 70
 8a
 30
@@ -2228,7 +2364,7 @@
 20
 20
 03
-f6
+a4
 20
 75
 80
@@ -2260,7 +2396,7 @@
 c0
 0c
 02
-36
+58
 6f
 e0
 c4
@@ -2352,7 +2488,7 @@
 20
 20
 02
-17
+39
 6f
 e0
 c1
@@ -2360,7 +2496,7 @@
 c0
 05
 02
-4c
+6e
 20
 20
 22
@@ -2388,7 +2524,7 @@
 20
 35
 82
-78
+9a
 6f
 e2
 02
@@ -2556,7 +2692,7 @@
 20
 20
 02
-62
+84
 20
 40
 68
@@ -2663,6 +2799,14 @@
 00
 20
 40
+70
+d7
+20
+40
+42
+a3
+20
+40
 64
 54
 20
@@ -2673,14 +2817,10 @@
 40
 a6
 0a
-20
-40
-70
-d7
 58
 00
 03
-83
+32
 67
 e1
 43
@@ -2688,7 +2828,7 @@
 58
 00
 03
-58
+07
 67
 e1
 43
@@ -2696,7 +2836,7 @@
 58
 00
 03
-75
+24
 67
 e1
 43
@@ -2712,7 +2852,7 @@
 58
 00
 02
-ac
+cf
 67
 e1
 43
@@ -2728,7 +2868,7 @@
 58
 00
 02
-c1
+e4
 67
 e1
 43
@@ -2760,7 +2900,7 @@
 20
 40
 02
-b1
+d4
 20
 40
 70
@@ -2804,7 +2944,7 @@
 20
 22
 82
-bc
+df
 1f
 e2
 04
@@ -2812,7 +2952,7 @@
 20
 40
 02
-bf
+e2
 1a
 20
 a2
@@ -2820,7 +2960,7 @@
 c2
 00
 02
-b6
+d9
 20
 60
 00
@@ -2836,11 +2976,11 @@
 20
 40
 02
-c9
+ed
 20
 40
-03
-4c
+02
+ff
 20
 40
 68
@@ -2848,6 +2988,10 @@
 20
 40
 67
+6c
+20
+40
+67
 5a
 20
 40
@@ -2868,527 +3012,75 @@
 da
 60
 4f
-ba
+e5
 da
 40
 02
-cc
+f0
 20
 20
 42
 e0
-6f
-e0
-cf
-bd
-c0
-00
-82
-d0
-c0
-01
-03
-10
-20
-60
-00
-00
 70
 4f
-bd
-01
-20
-40
-67
-30
-24
-3a
+e5
 02
-f7
 6f
 e0
 cf
-c8
-24
-5a
+e6
+c0
 02
-ed
-70
-4f
-c8
-00
-70
-4f
-ba
-01
-70
-49
-e5
-0a
-6f
-e0
-cf
-be
-1f
-e0
-fe
+02
+f7
+c0
 01
-67
-e0
-cf
-be
-1f
-e6
-7c
-5a
-20
-22
-82
-ea
-da
-40
-4f
-bf
-d8
-40
-4c
 02
-ef
-e0
-80
-12
-1f
-e0
-ff
-ff
-1f
-ef
-fe
-0a
-98
-40
-8c
-00
-18
+f9
 c0
-8c
-06
-18
-c2
-22
-00
-ef
-e1
-00
-06
-1f
-e0
-fe
-1e
-e7
-e1
-00
-11
-da
-60
-4f
-bf
-20
-20
-63
-71
-70
-4f
-be
 00
-da
-60
-4f
-c5
-20
-40
-63
-71
-da
-40
-4f
-bf
-d8
-40
-4c
 02
-ef
-e0
-80
-12
-1f
-e0
-ff
-ff
-1f
-ef
-fe
-0a
-98
-40
-a2
-00
-1a
-20
-a2
-06
-58
-00
-01
-f0
-e7
-e1
-00
-11
-20
-60
-00
-00
-70
-4f
-ba
+fb
+c0
 02
-6f
-e0
-cf
-c9
-1f
-e0
-fe
-01
-67
-e0
-cf
-c9
-1f
-e6
-7c
-28
+82
+fd
 20
-22
-83
-0c
-6f
-e0
-cf
-ca
-24
-3a
-03
-04
-70
-4f
-ba
-01
-70
-4e
-c5
-00
-70
-49
-e5
-14
-da
 60
-4f
-d1
-20
-20
-63
-71
-70
-4f
-c9
 00
-70
-4f
-ca
 00
-70
-4f
-ba
-04
-da
-60
-4f
-e3
 20
 40
-63
-71
-70
-49
-e5
-f0
-da
-60
-4f
-cb
-20
-20
-63
-71
-70
-4f
-c9
-00
-70
-4f
-ca
 01
-70
-4f
-ba
-08
-20
-60
-00
-00
-70
-4f
-bd
-02
-20
-40
-67
-30
-24
-3a
-03
 37
-6f
-e0
-cf
-c8
-24
-5a
-03
-2d
-70
-4f
-c8
-00
-70
-4f
-ba
-01
-70
-49
-e5
-0a
-6f
-e0
-cf
-be
-1f
-e0
-fe
-01
-67
-e0
-cf
-be
-1f
-e6
-7c
-5a
-20
-22
-83
-2a
-da
-40
-4f
-c2
-d8
-40
-4c
-02
-ef
-e0
-80
-12
-1f
-e0
-ff
-ff
-1f
-ef
-fe
-0a
-98
-40
-8c
-00
-18
-c0
-8c
-06
-18
-c2
-22
-00
-ef
-e1
-00
-06
-1f
-e0
-ff
-e2
-e7
-e1
-00
-11
-da
-60
-4f
-c2
 20
 20
-63
-71
-70
-4f
-be
 00
-da
-60
-4f
-bb
+cc
 20
 40
-63
-71
-da
-40
-4f
-c2
-d8
-40
-4c
-02
-ef
-e0
-80
-12
-1f
-e0
-ff
-ff
-1f
-ef
-fe
-0a
-98
-40
-a2
-00
-1a
+01
+55
 20
-a2
-06
-58
-00
-0b
-f0
-e7
-e1
-00
-11
 20
-60
 00
-00
-70
-4f
-ba
-02
-6f
-e0
-cf
-c9
-1f
-e0
-fe
-01
-67
-e0
-cf
-c9
-1f
-e6
-7c
-1e
+cc
 20
-22
-83
-0c
-6f
-e0
-cf
-ca
-24
-3a
-03
-44
-70
-4f
-ba
-01
-70
-4e
-c5
-00
-70
-49
-e5
-14
-da
-60
-4f
-dd
+40
+01
+2f
 20
 20
-63
-71
-70
-4f
-c9
 00
-70
-4f
-ca
-00
-70
-4f
-ba
-04
-da
-60
-4f
-e3
+cc
 20
 40
-63
-71
-70
-49
-e5
-f0
-da
-60
-4f
-d7
+01
+1e
 20
 20
-63
-71
+00
+cc
 6f
 e0
 ce
@@ -3404,7 +3096,7 @@
 da
 40
 03
-51
+04
 20
 20
 42
@@ -3413,26 +3105,10 @@
 4f
 b8
 05
-6f
-e0
-cf
-b9
-79
+20
 40
-7e
-00
-67
-e0
-cf
-b9
-c0
-00
 43
 23
-c0
-00
-c3
-25
 20
 60
 00
@@ -3444,11 +3120,11 @@
 c0
 20
 03
-6c
+1b
 c0
 18
 83
-5c
+0b
 20
 20
 64
@@ -3460,7 +3136,7 @@
 20
 40
 03
-5f
+0e
 20
 60
 00
@@ -3472,11 +3148,11 @@
 20
 3a
 03
-62
+11
 20
 20
 03
-67
+16
 6f
 e1
 4f
@@ -3540,7 +3216,7 @@
 24
 3a
 03
-80
+2f
 6f
 e4
 4f
@@ -3560,7 +3236,7 @@
 c0
 12
 03
-78
+27
 20
 60
 00
@@ -3584,7 +3260,7 @@
 24
 3a
 03
-80
+2f
 6f
 e4
 4f
@@ -3656,7 +3332,7 @@
 20
 20
 03
-8f
+3e
 6f
 e1
 48
@@ -3720,7 +3396,7 @@
 20
 40
 03
-ac
+5b
 6f
 e1
 06
@@ -3768,7 +3444,7 @@
 c2
 00
 03
-98
+47
 20
 60
 00
@@ -3812,7 +3488,7 @@
 20
 20
 03
-b6
+65
 1a
 60
 8c
@@ -3824,7 +3500,7 @@
 20
 20
 03
-b9
+68
 20
 40
 65
@@ -3848,7 +3524,7 @@
 20
 40
 03
-c0
+6f
 20
 20
 65
@@ -3880,11 +3556,7 @@
 70
 49
 e5
-5a
-c1
-00
-80
-00
+01
 20
 60
 00
@@ -3940,7 +3612,7 @@
 20
 40
 03
-e6
+94
 2a
 2f
 fe
@@ -3972,7 +3644,7 @@
 20
 40
 03
-e6
+94
 d8
 a0
 8a
@@ -4000,7 +3672,7 @@
 20
 21
 03
-db
+89
 20
 20
 21
@@ -4103,8 +3775,8 @@
 b8
 20
 40
-04
-1f
+03
+cd
 70
 8a
 08
@@ -4139,8 +3811,8 @@
 00
 20
 40
-04
-15
+03
+c3
 6f
 f0
 8a
@@ -4183,8 +3855,8 @@
 b8
 20
 40
-04
-1f
+03
+cd
 70
 80
 cd
@@ -4243,8 +3915,8 @@
 29
 c3
 02
-84
-20
+83
+ce
 68
 59
 01
@@ -4279,8 +3951,8 @@
 99
 c0
 08
-04
-3f
+03
+ed
 58
 00
 57
@@ -4323,8 +3995,8 @@
 99
 c0
 08
-04
-3c
+03
+ea
 58
 00
 2b
@@ -4359,8 +4031,8 @@
 07
 20
 20
-04
-38
+03
+e6
 58
 00
 83
@@ -4371,8 +4043,8 @@
 07
 20
 20
-04
-2d
+03
+db
 6f
 e0
 c3
@@ -4420,7 +4092,7 @@
 20
 40
 04
-59
+07
 6f
 e0
 c0
@@ -4532,7 +4204,7 @@
 20
 22
 84
-6c
+1a
 e7
 e0
 80
@@ -4552,7 +4224,7 @@
 c2
 00
 04
-66
+14
 1a
 42
 04
@@ -4561,8 +4233,8 @@
 60
 00
 00
-32
-fb
+94
+0c
 aa
 55
 40
@@ -4661,31 +4333,34 @@
 2a
 aa
 55
-0e
+0a
 00
 6b
 42
-0d
-43
-6f
-6e
-74
-72
-6f
-6c
-6c
+09
+42
 65
-72
+61
+75
+74
+79
 2d
 52
 31
 aa
 55
-01
+08
 00
 41
 41
 06
+00
+0a
+0e
+00
+0a
+dd
+00
 aa
 55
 04
@@ -4740,14 +4415,14 @@
 4f
 00
 00
-8a
+86
 46
 00
 96
 00
 01
 03
-8a
+86
 46
 00
 96
@@ -4796,13 +4471,13 @@
 e3
 4e
 07
-06
-0d
 0f
-0c
-14
 12
+08
 07
+14
+0c
+0d
 aa
 55
 0a
@@ -4829,29 +4504,17 @@
 00
 aa
 55
-07
+01
 00
 b6
 4e
-12
-12
-13
-14
-0b
-0b
 00
 aa
 55
-07
+01
 00
 cf
 4e
-12
-12
-13
-2d
-0b
-0b
 00
 aa
 55
@@ -4886,15 +4549,15 @@
 00
 57
 4b
-0a
-0e
-0e
-0e
-0b
-0d
-0d
-0d
-00
+23
+24
+25
+26
+27
+28
+29
+2a
+2b
 aa
 55
 03
@@ -4944,15 +4607,15 @@
 00
 75
 4b
-0a
-10
-10
-10
-0b
-0f
-0f
-0f
-00
+20
+1f
+1e
+1d
+1c
+1b
+1a
+19
+21
 aa
 55
 01
@@ -4962,21 +4625,25 @@
 00
 aa
 55
-03
+05
 00
 84
 4b
-33
+07
+0a
 09
+0b
 00
 aa
 55
-03
+05
 00
 f4
 4b
-33
+08
+0a
 09
+0b
 00
 aa
 55
@@ -4991,15 +4658,15 @@
 00
 93
 4b
-0a
-0f
-0f
-0f
-0b
-10
-10
-10
-00
+19
+1a
+1b
+1c
+1d
+1e
+1f
+20
+21
 aa
 55
 01
@@ -5009,19 +4676,20 @@
 00
 aa
 55
-09
+0a
 00
 a2
 4b
-0a
-0d
-0d
-0d
-0b
-0e
-0e
-0e
-00
+2b
+2a
+29
+28
+27
+26
+25
+24
+23
+22
 aa
 55
 03
@@ -5033,21 +4701,17 @@
 00
 aa
 55
-03
+01
 00
 b1
 4b
-0a
-0b
 00
 aa
 55
-03
+01
 00
 8a
 4a
-18
-35
 00
 aa
 55
@@ -5073,10 +4737,12 @@
 2b
 aa
 55
-01
+03
 00
 99
 4a
+34
+09
 00
 aa
 55
@@ -5087,12 +4753,13 @@
 00
 aa
 55
-02
+03
 00
 3f
 4a
 1c
 2c
+00
 aa
 55
 05
@@ -5151,21 +4818,25 @@
 00
 aa
 55
-03
+05
 00
 5d
 4a
-34
+07
+18
 09
+35
 00
 aa
 55
-03
+05
 00
 ea
 4b
-34
+08
+18
 09
+35
 00
 aa
 55
@@ -5214,11 +4885,12 @@
 00
 aa
 55
-0b
+0a
 00
 7b
 4a
-44
+2b
+2a
 29
 28
 27
@@ -5226,91 +4898,15 @@
 25
 24
 23
-43
-42
-41
+22
 aa
 55
-01
+03
 00
 a8
 4a
-00
-aa
-55
-02
-00
-bf
-4f
-3d
-00
-aa
-55
-02
-00
-c2
-4f
-3f
-00
-aa
-55
-02
-00
-c5
-4f
-3e
-00
-aa
-55
-02
-00
-bb
-4f
-40
-00
-aa
-55
-02
-00
-e3
-4f
-0b
-00
-aa
-55
-0c
-00
-d7
-4f
-12
-12
-3a
-39
-0b
-00
-0a
-3b
-3b
-3b
-3c
-00
-aa
-55
-0c
-00
-cb
-4f
-12
-12
-3a
-38
-0b
-00
-0a
-37
-37
-37
-36
+32
+09
 00
 aa
 55
@@ -5899,15 +5495,15 @@
 00
 00
 00
-07
-13
+05
+23
+00
+00
+00
+00
+00
 00
 00
-06
-70
-07
-78
-05
 00
 03
 1f
@@ -5969,84 +5565,84 @@
 ac
 0d
 01
-05
-23
+03
+17
+00
+00
+fa
+00
+00
+00
 00
-07
 00
 03
-f0
-01
+17
+00
+00
+28
 00
 00
-05
-23
 00
 00
 00
 03
-f0
-01
+17
+00
+00
+d2
+00
 00
 00
-05
-23
 00
-07
 00
 03
-f0
-0b
+17
+00
+00
+32
 00
 00
-05
-23
 00
 00
 00
 03
-f0
-0a
+17
 00
 00
-05
-23
 00
+fa
 00
-e0
-06
-50
-06
 00
 00
-05
-23
 00
-07
-e0
-06
-50
-06
+03
+17
+00
 00
 00
 05
-23
 00
-07
-18
-06
-50
-06
 00
 00
-05
-23
 00
-07
-3a
-01
-50
-06
+03
+17
+00
+00
+00
+f0
+00
+00
+00
+00
+03
+17
+00
+00
+00
+0f
+00
+00
 00
 00
 aa
@@ -6064,9 +5660,9 @@
 00
 02
 4f
-13
+06
 00
-18
+0a
 00
 10
 00
@@ -6078,9 +5674,9 @@
 00
 b0
 4f
-13
+0f
 00
-18
+0f
 00
 10
 00
@@ -7018,7 +6614,7 @@
 aa
 aa
 55
-69
-88
-2a
-9e
+c9
+71
+7b
+1c
Index: output/ramcode.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/output/ramcode.rom	(revision 6309)
+++ /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/output/ramcode.rom	(working copy)
@@ -1,30 +1,30 @@
 c2840016
 c000001d
-c00101e1
-c00881ea
-c00a0426
-c00a827c
-c00c028a
-c00c8249
-c00d01fc
-c0128448
+c0010203
+c008820c
+c00a03d4
+c00a829e
+c00c02ac
+c00c826b
+c00d021e
+c01283f6
 c0138048
-c0518084
-c05281c2
+c051809d
+c05281e3
 c0530053
-c053805f
-c05501b1
-c05680a0
-c0588294
-c0628291
-c06d03f7
-c06e0407
+c0538078
+c05501d2
+c05680bf
+c05882b6
+c06282b3
+c06d03a5
+c06e03b5
 2020235a
 c0120021
-c012819a
-c013019f
-c01c8442
-c0268446
+c01281bb
+c01301c0
+c01c83f0
+c02683f4
 c17f8000
 2020235a
 2435a002
@@ -81,22 +81,47 @@
 20407d10
 1a220400
 2020247d
-20400059
-c1830000
-6fe0cec7
-c00065a2
-c000e5a5
+6fe0cec9
+243a0065
+18e27e00
+c0016765
+c0026761
+c000e777
+c000005c
+c0028063
+20600000
+2040005e
+20206371
+da604a99
+20406730
+207a0000
+da604bc0
 20600000
+da604aa8
+20206371
 18e27e00
-c002e765
-c0006761
-c00202d0
-c0010310
+c002006c
+c001006f
+c0000072
+c0028075
+c000e777
+20600000
+704fe501
+704fe604
+20600000
+704fe501
+704fe602
+20600000
+704fe501
+704fe600
+20600000
+704fe501
+704fe605
 20600000
 6fe0cec7
 c000e5cf
 20406628
-20400065
+2040007e
 20740000
 202065cf
 d8e00000
@@ -108,59 +133,65 @@
 207a0000
 684906f1
 9842fc00
-20228071
+2022808a
 18e08e01
-20200066
+2020007f
 67e14acf
 20404323
 da604ad1
 dfe0000a
 98effe00
 9a60a600
-204000a9
+204000c8
 20206633
 6fe14acf
 207a0000
 684906f1
 18467c00
-2022807f
-2020007e
+20228098
+20200097
 704ec001
 20404325
 da604b0d
-204000a9
+204000c8
 20206639
 6fe0cf9f
 243a6502
 704c0001
-20404323
+6fe0cec9
+205a4323
 2040652c
 20406561
 20216500
 18e27e00
 6848cec5
 98467c00
-24428194
-6fe0cec9
-245a018e
+244281b5
+204000b2
 18e27e00
 67e0cec5
 6848cec8
 98467c00
-20228099
+202280b8
 6fe0cec9
-243a009b
+243a00ba
 2020651c
+18e27e00
+c1830000
+6fe0cec9
+79407e00
+67e0cec9
+20600000
 704ec601
-202000ad
+202000cc
 2040677f
 18e27e00
 c000e51c
-204000b2
-202000ad
+204000d1
+202000cc
 20406821
 20406730
-203a00a4
+203a00c3
 20206812
 6fe14f74
 67e14eae
@@ -170,39 +201,39 @@
 2040677f
 efe08013
 207a0000
-204000b2
-204000f5
+204000d1
+20400114
 20406730
-243a00c4
+243a00e3
 dfe00035
 20206382
 6fe0cec7
-c00080b6
-c00000bc
+c00080d5
+c00000db
 20600000
 18e27e00
-c00280ff
-c0000110
-c0020118
-c0010136
+c002811e
+c000012f
+c0020137
+c0010155
 20600000
 efe08013
-c00080ff
-c0010110
-c0018118
-c0020136
-c00280c3
-20600000
-20200177
-204000cc
-204000e1
+c000811e
+c001012f
+c0018137
+c0020155
+c00280e2
+20600000
+20200196
 204000eb
+20400100
+2040010a
 dfe00005
 20406382
 7049e53c
 dfe00006
 20206382
-204000d7
+204000f6
 18427e00
 207a0000
 67e0ceb3
@@ -212,7 +243,7 @@
 1fe0ffff
 67e0ceb3
 207a0000
-202000d0
+202000ef
 6848ceaa
 20406730
 207a0000
@@ -232,7 +263,7 @@
 1fe0ffff
 67e0ceb4
 207a0000
-202000e4
+20200103
 6fe0cead
 207a0000
 67e0ceb5
@@ -242,45 +273,45 @@
 1fe0ffff
 67e0ceb5
 207a0000
-202000ee
+2020010d
 6fe0ceab
 247a0000
 704eab01
-20200106
+20200125
 6fe0ceac
 207a0000
 1fe0ffff
 67e0ceac
 dfe00072
 20600000
-20400156
+20400175
 6fe14eae
 98467c00
-244100f9
+24410118
 24610000
 98467e00
 67e14eae
 20406730
-203a0166
+203a0185
 6fe14eae
 68494eb0
 184d0400
 18520400
 9840fe00
 67e1cb17
-2040016d
-20200177
+2040018c
+20200196
 20406730
-245a015b
-20400156
+245a017a
+20400175
 6fe14eae
 9840fe00
 d8400fff
 20407d6c
-20200105
+20200124
 20406730
-203a012f
-20400156
+203a014e
+20400175
 6fe14eb0
 98467e00
 67e14eb0
@@ -289,44 +320,44 @@
 98467e00
 d8400072
 98460400
-24210106
+24210125
 58000fff
 98467e00
 6848cead
 18467c05
-2022812c
+2022814b
 18408401
 6048cead
-2020014f
+2020016e
 704ead00
 58000fff
-2020014f
-20400156
+2020016e
+20400175
 6fe14eb0
 98467c00
 24610000
 98467e00
 67e14eb0
-20200106
+20200125
 20406730
-203a013f
-20400156
+203a015e
+20400175
 6fe14eb0
 9840fe00
 d8400fff
 98462200
-20210145
-2020014f
-20400156
+20210164
+2020016e
+20400175
 6fe14eb0
 9840fe00
 d8400fff
 20407d6c
-2020014f
+2020016e
 20406730
-203a0151
+203a0170
 6fe0cead
-203a0151
+203a0170
 1fe0ffff
 67e0cead
 58000fff
@@ -334,12 +365,12 @@
 98467e00
 9a20fe00
 67e14eb0
-20200106
+20200125
 58000fff
-2020014f
+2020016e
 704eac00
 dfe00000
-20200105
+20200124
 d840002a
 20406730
 207a0000
@@ -352,19 +383,19 @@
 18427e00
 6848ceac
 18467c03
-20228153
+20228172
 18408401
 6048ceac
-20200105
+20200124
 6fe14eae
 68494eb0
 18500400
 9840fe00
 67e24b17
-2040016d
-20200177
+2040018c
+20200196
 20406730
-243a0181
+243a01a0
 58000017
 1feffe0a
 d8404c02
@@ -374,7 +405,7 @@
 e7e20005
 20600000
 20406730
-243a0181
+243a01a0
 58000034
 1feffe0a
 d8404c02
@@ -396,14 +427,16 @@
 1fed7e00
 e7e18005
 20600000
+704fe701
 18e27e00
-c0030191
+c00301b2
+c00081b2
 20600000
 70489e14
 704ec900
 20204325
 6fe0cec9
-203a0197
+203a01b8
 20206529
 20406730
 207a0000
@@ -435,13 +468,13 @@
 efe18006
 67e1c397
 c003e704
-c00081b7
+c00081d8
 202066db
 18c08dfe
 efe08006
-c00301bb
+c00301dc
 20600000
-204001bd
+204001de
 202067bf
 704eaa01
 7049e400
@@ -462,11 +495,11 @@
 24417806
 1a608c09
 efe08006
-243a01d2
+243a01f3
 20206547
 704ec001
 2040656b
-204001dd
+204001fe
 da604aae
 dfe00003
 2020655a
@@ -475,7 +508,8 @@
 704fc900
 704fc801
 20600000
-204001d8
+704fe500
+704fe6ff
 704bfe00
 704f8d00
 20600000
@@ -487,7 +521,7 @@
 20402018
 2040310f
 2040248c
-202001e1
+20200203
 708a0f60
 708a10aa
 708a127a
@@ -517,14 +551,14 @@
 708a844a
 708a8540
 708a16fe
-20400251
+20400273
 6fe0c436
 205a70d7
-245581f8
+2455821a
 37d98200
 70813b5f
 6fe0c099
-c008023e
+c0080260
 6fe0c438
 1fe1fe04
 67f08a02
@@ -535,15 +569,15 @@
 67f18a73
 708a8660
 708a8b3b
-20400230
+20400252
 70804300
 70804205
 58557474
 67f18968
 7089606e
-204003c9
-204003f4
-2040022a
+20400377
+204003a2
+2040024c
 708a3006
 708a32dd
 708a88e0
@@ -551,7 +585,7 @@
 708a3178
 7041480c
 20406f4e
-202003f6
+202003a4
 20758000
 37d98200
 6fe0c11c
@@ -559,7 +593,7 @@
 37d98200
 20600000
 6fe0c099
-c00c0236
+c00c0258
 6fe0c438
 1fe1fe06
 67f08a02
@@ -582,16 +616,16 @@
 67f18a73
 708a762a
 70890204
-20200217
+20200239
 6fe0c141
-c005024c
+c005026e
 2020220e
 708a1425
 58a93f3f
 67f18a60
 708a631f
 20600000
-20358278
+2035829a
 6fe2020d
 207a0000
 37d98200
@@ -633,7 +667,7 @@
 6fe1415b
 207a0000
 67e1020f
-20200262
+20200284
 2040686f
 204021ba
 18002a08
@@ -660,23 +694,24 @@
 20206b38
 20407396
 20758000
+204070d7
+204042a3
 20406454
 20406459
 7040a60a
-204070d7
-58000383
+58000332
 67e143db
-58000358
+58000307
 67e143dd
-58000375
+58000324
 67e143df
 580062d3
 67e143d3
-580002ac
+580002cf
 67e143d5
 58006329
 67e143d7
-580002c1
+580002e4
 67e143e3
 58006505
 67e14524
@@ -684,7 +719,7 @@
 2020647d
 20406f35
 7044ecff
-204002b1
+204002d4
 2040701b
 2020739a
 6fe0c6ce
@@ -695,175 +730,59 @@
 efe08011
 6848c6cf
 98467c00
-202282bc
+202282df
 1fe20400
-204002bf
+204002e2
 1a20a201
-c20002b6
+c20002d9
 20600000
 79200407
 20206edd
-204002c9
-2040034c
+204002ed
+204002ff
 20406858
+2040676c
 2040675a
 204064bc
 204064d3
 20406311
 202064d9
-da604fba
-da4002cc
+da604fe5
+da4002f0
 202042e0
-6fe0cfbd
-c00082d0
-c0010310
-20600000
-704fbd01
-20406730
-243a02f7
-6fe0cfc8
-245a02ed
-704fc800
-704fba01
-7049e50a
-6fe0cfbe
-1fe0fe01
-67e0cfbe
-1fe67c5a
-202282ea
-da404fbf
-d8404c02
-efe08012
-1fe0ffff
-1feffe0a
-98408c00
-18c08c06
-18c22200
-efe10006
-1fe0fe1e
-e7e10011
-da604fbf
-20206371
-704fbe00
-da604fc5
-20406371
-da404fbf
-d8404c02
-efe08012
-1fe0ffff
-1feffe0a
-9840a200
-1a20a206
-580001f0
-e7e10011
-20600000
-704fba02
-6fe0cfc9
-1fe0fe01
-67e0cfc9
-1fe67c28
-2022830c
-6fe0cfca
-243a0304
-704fba01
-704ec500
-7049e514
-da604fd1
-20206371
-704fc900
-704fca00
-704fba04
-da604fe3
-20406371
-7049e5f0
-da604fcb
-20206371
-704fc900
-704fca01
-704fba08
-20600000
-704fbd02
-20406730
-243a0337
-6fe0cfc8
-245a032d
-704fc800
-704fba01
-7049e50a
-6fe0cfbe
-1fe0fe01
-67e0cfbe
-1fe67c5a
-2022832a
-da404fc2
-d8404c02
-efe08012
-1fe0ffff
-1feffe0a
-98408c00
-18c08c06
-18c22200
-efe10006
-1fe0ffe2
-e7e10011
-da604fc2
-20206371
-704fbe00
-da604fbb
-20406371
-da404fc2
-d8404c02
-efe08012
-1fe0ffff
-1feffe0a
-9840a200
-1a20a206
-58000bf0
-e7e10011
-20600000
-704fba02
-6fe0cfc9
-1fe0fe01
-67e0cfc9
-1fe67c1e
-2022830c
-6fe0cfca
-243a0344
-704fba01
-704ec500
-7049e514
-da604fdd
-20206371
-704fc900
-704fca00
-704fba04
-da604fe3
-20406371
-7049e5f0
-da604fd7
-20206371
+704fe502
+6fe0cfe6
+c00202f7
+c00102f9
+c00002fb
+c00282fd
+20600000
+20400137
+202000cc
+20400155
+202000cc
+2040012f
+202000cc
+2040011e
+202000cc
 6fe0cec9
 207a0000
 da604fb8
-da400351
+da400304
 202042e0
 704fb805
-6fe0cfb9
-79407e00
-67e0cfb9
-c0004323
-c000c325
+20404323
 20600000
 1a627e00
-c020036c
-c018835c
+c020031b
+c018830b
 202064e0
 704ec201
-2040035f
+2040030e
 20600000
 20406730
-203a0362
-20200367
+203a0311
+20200316
 6fe14f74
 67e14eae
 6fe14f76
@@ -879,18 +798,18 @@
 6fe4450a
 207a0000
 20406730
-243a0380
+243a032f
 6fe44f02
 67e442d3
 20202e93
 6fe14398
-c0120378
+c0120327
 20600000
 204078ad
 7044f101
 20406730
 2040432b
-243a0380
+243a032f
 6fe44f02
 67e442d3
 20202e93
@@ -908,7 +827,7 @@
 20407ce1
 78547c00
 2040701b
-2020038f
+2020033e
 6fe148ac
 67e1442e
 204065be
@@ -924,7 +843,7 @@
 67e1068c
 18e27e00
 67e1067a
-204003ac
+2040035b
 6fe1068c
 1fe22600
 6fe1067a
@@ -936,7 +855,7 @@
 1fe0a60a
 6fe10678
 1fe27200
-c2000398
+c2000347
 20600000
 1a60a405
 efe20012
@@ -947,16 +866,16 @@
 24417806
 580003e8
 98467c00
-202003b6
+20200365
 1a608c04
 efe08006
-202003b9
+20200368
 2040656b
 6fe0cec9
 243a655d
 20406561
 20216500
-204003c0
+2040036f
 20206557
 da604a30
 7049e50a
@@ -964,8 +883,7 @@
 207a0000
 da604b57
 18e27e00
-7049e55a
-c1008000
+7049e501
 20600000
 20758000
 20402160
@@ -979,7 +897,7 @@
 708ac200
 708ac300
 d8e00006
-204003e6
+20400394
 2a2ffe0d
 2040211d
 2a4ffe0d
@@ -987,14 +905,14 @@
 d8e00005
 2040211c
 2040211e
-204003e6
+20400394
 d8a08ac2
 1a31fe00
 20402117
 1a51fe00
 20402117
 18e08fff
-202103db
+20210389
 2020214f
 2000003c
 58000f00
@@ -1020,7 +938,7 @@
 6fe0c409
 67f080cd
 20000bb8
-2040041f
+204003cd
 708a08c1
 6a40c419
 df200008
@@ -1029,7 +947,7 @@
 67e0c433
 6240c419
 20600000
-20400415
+204003c3
 6ff08a09
 793ffe07
 67f08a09
@@ -1040,7 +958,7 @@
 6fe0c409
 67f080cd
 20000bb8
-2040041f
+204003cd
 7080cd00
 20206fa1
 6ff080cc
@@ -1055,7 +973,7 @@
 20600000
 7080cc03
 6ff08129
-c3028420
+c30283ce
 68590164
 6049440a
 7080cc00
@@ -1064,7 +982,7 @@
 708a8d12
 708a8e0a
 6fe0c099
-c008043f
+c00803ed
 58005762
 67f10907
 70890103
@@ -1075,7 +993,7 @@
 708a8d44
 708a8e0a
 6fe0c099
-c008043c
+c00803ea
 58002bb1
 67f10907
 c6978000
@@ -1084,10 +1002,10 @@
 20600000
 58004189
 67f10907
-20200438
+202003e6
 58008312
 67f10907
-2020042d
+202003db
 6fe0c334
 c1000000
 c001b04a
@@ -1099,7 +1017,7 @@
 6fe240ad
 9840fe00
 67e240ad
-20400459
+20400407
 6fe0c0cb
 79207e04
 204023e1
@@ -1127,11 +1045,11 @@
 efe08011
 e8408013
 98467c00
-2022846c
+2022841a
 e7e08013
 37d98200
 1a20a201
 1a60a601
-c2000466
+c2000414
 1a420400
 20600000
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/output/sched.rom	(revision 6309)
+++ /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/output/sched.rom	(working copy)
@@ -72,11 +72,11 @@
 
 mem_le_lap:1a 21 20 98 07 2a
 mem_le_name_len:
-'Controller-R1
+'Beauty-R1
 
 mem_tx_power:06
 
-#save otp addr
+//save otp addr
 mem_shutter_efuse_start_offset:b0 1f
 mem_shutter_efuse_end_offset:f0 1b
 
@@ -98,14 +98,14 @@
 00		#type:stop blink
 00		#blink count:no blink
 # 8c		#led gpio number:GPIO01
-8a
+86
 46 00	#led blink light time
 96 00	#led blink dark time
 mem_shutter_led_off_light_dark_led_conf:
 01		#type:start blink
 03		#blink count:no blink
 # 8c		#led gpio number:GPIO01
-8a
+86
 46 00	#led blink light time
 96 00	#led blink dark time
 
@@ -154,13 +154,13 @@
 # 0d   #move
 
 #xfy 1088s
-06	  #right
-0d	  #like
-0f    #down
-0c    #photo
+0f	  #right
+12	  #like
+08    #down
+07    #photo
 14	  #up
-12    #left
-07	  #move
+0c    #left
+0d	  #move
 
 
 
@@ -199,19 +199,23 @@
 #7key
 40 00
 
-mem_shutter_iphone_move_mid:
-12 12 13 14 0b 0b 00
+mem_shutter_iphone_move_mid:#设为00,退出move后,按move键不会跳转光标
+# 12 12 13 14 0b 0b 00
+00
 mem_shutter_iphone_up_mid:
-12 12 13 2d 0b 0b 00
+# 12 12 13 2d 0b 0b 00
+00
 mem_shutter_iphone_like_mid:
 12 12 13 2e 0b 0b 00
+# 00
 mem_shutter_android_move_mid:
 00
 
 mem_key0_press_i:  #right
 00
 mem_key0_release_new_i:
-0a 0e 0e 0e 0b 0d 0d 0d 00
+# 0a 0e 0e 0e 0b 0d 0d 0d 00
+23 24 25 26 27 28 29 2a 2b
 mem_key0_long_press_i:
 33 09 00
 
@@ -222,49 +226,55 @@
 
 mem_shutter_link_data_i:
 0a 0b 0a 0b 00
+# 1c 2c 1c 2c 00
 
 mem_key2_press_i:#down
 00
 mem_key2_release_new_i:
-0a 10 10 10 0b 0f 0f 0f 00
-
+# 0a 10 10 10 0b 0f 0f 0f 00
+20 1f 1e 1d 1c 1b 1a 19 21
 
 #toggle between vol-inc and vol-dec
 mem_key3_press_i:#photo
 00
 mem_key3_release_new_i:#volume increment
-33 09 00
+07 0a 09 0b 00
 mem_key3_release_new_i_t:#volume decrement
-33 09 00
+08 0a 09 0b 00
 
 mem_key4_press_i:#up
 00
 mem_key4_release_new_i:
-0a 0f 0f 0f 0b 10 10 10 00
+# 0a 0f 0f 0f 0b 10 10 10 00
+19 1a 1b 1c 1d 1e 1f 20 21
 
 mem_key5_press_i:#left
 00
 mem_key5_release_new_i:
-0a 0d 0d 0d 0b 0e 0e 0e 00
+# 0a 0d 0d 0d 0b 0e 0e 0e 00
+2b 2a 29 28 27 26 25 24 23 22
 mem_key5_long_press_i: #lock
 32 09 00
 
 
 mem_key6_release_new_i:#move
-0a 0b 00
+# 0a 0b 00
+00
 mem_key6_release_new:#move
-18 35 00
+# 18 35 00
+00
 mem_dy_key0_press:  #right
 00
 mem_key0_release_new:
 23 24 25 26 27 28 29 2a 2b
 mem_key0_long_press:
-00
+34 09 00
 
 mem_dy_key1_press:#like
 00
 mem_key1_release_new:
-1c 2c
+1c 2c 00
+# 18 36 00
 mem_shutter_link_data:
 1c 2c 1c 2c 00
 
@@ -280,9 +290,9 @@
 mem_dy_key3_press:#photo
 00
 mem_key3_release_new:#volume increment
-34 09 00
+07 18 09 35 00
 mem_key3_release_new_t:#volume decrement
-34 09 00
+08 18 09 35 00
 
 mem_dy_key4_press:#up
 00
@@ -296,29 +306,29 @@
 mem_dy_key5_press:#left
 00
 mem_key5_release_new:
-44 29 28 27 26 25 24 23 43 42 41
+2b 2a 29 28 27 26 25 24 23 22
 mem_key5_long_press: #lock
-00
-
-mem_shutter_dy_up_long_press:
-3d 00
-mem_shutter_dy_down_long_press:
-3f 00
-mem_shutter_dy_drag_up_release:
-3e 00
-mem_dy_android_release:
-40 00
+32 09 00
 
-mem_dy_ios_release:
-0b 00
-mem_shutter_iphone_down_drag_mid:
-12 12 3a 39 0b 00
-mem_key2_long_press_i_drag:
-0a 3b 3b 3b 3c 00
-mem_shutter_iphone_up_drag_mid:
-12 12 3a 38 0b 00
-mem_key4_long_press_i_drag:
-0a 37 37 37 36 00
+# mem_shutter_dy_up_long_press:
+# 3d 00
+# mem_shutter_dy_down_long_press:
+# 3f 00
+# mem_shutter_dy_drag_up_release:
+# 3e 00
+# mem_dy_android_release:
+# 40 00
+
+# mem_dy_ios_release:
+# 0b 00
+# mem_shutter_iphone_down_drag_mid:
+# 12 12 3a 39 0b 00
+# mem_key2_long_press_i_drag:
+# 0a 3b 3b 3b 3c 00
+# mem_shutter_iphone_up_drag_mid:
+# 12 12 3a 38 0b 00
+# mem_key4_long_press_i_drag:
+# 0a 37 37 37 36 00
 
 
 mem_combine_key0_press:
@@ -404,24 +414,34 @@
 
 05 23 00 06 00 00 00 00 00 00 #35
 
-07 13 00 00 06 70 07 78 05 00 #36
-03 1f 00 00 40 00 00 00 00 00 #37         
-03 1f 00 3c 40 04 00 00 00 00 #38        
+05 23 00 00 00 00 00 00 00 00 #36
+03 1f 00 00 40 00 00 00 00 00 #37
+03 1f 00 3c 40 04 00 00 00 00 #38
 03 1f 00 3c 40 15 00 00 00 00 #39
-03 1f 00 00 10 80 00 00 00 00 #3a               
-03 1f 00 00 c0 ff 00 00 00 00 #3b             
-07 13 00 07 06 70 07 ac 0d 01 #3c 
-
-05 23 00 07 00 03 f0 01 00 00 #3d drag up
-05 23 00 00 00 03 f0 01 00 00 #3e
-05 23 00 07 00 03 f0 0b 00 00 #3f drag down
-05 23 00 00 00 03 f0 0a 00 00 #40
-
-05 23 00 00 e0 06 50 06 00 00 #41 
-05 23 00 07 e0 06 50 06 00 00 #42
-05 23 00 07 18 06 50 06 00 00 #43
-05 23 00 07 3a 01 50 06 00 00 #44
-              
+03 1f 00 00 10 80 00 00 00 00 #3a
+03 1f 00 00 c0 ff 00 00 00 00 #3b
+07 13 00 07 06 70 07 ac 0d 01 #3c
+
+# 05 23 00 07 00 03 f0 01 00 00 #3d drag up
+# 05 23 00 00 00 03 f0 01 00 00 #3e
+# 05 23 00 07 00 03 f0 0b 00 00 #3f drag down
+# 05 23 00 00 00 03 f0 0a 00 00 #40
+
+# 05 23 00 00 e0 06 50 06 00 00 #41
+# 05 23 00 07 e0 06 50 06 00 00 #42
+# 05 23 00 07 18 06 50 06 00 00 #43
+# 05 23 00 07 3a 01 50 06 00 00 #44
+
+03 17 00 00 fa 00 00 00 00 00 #3d
+03 17 00 00 28 00 00 00 00 00 #3e
+03 17 00 00 d2 00 00 00 00 00 #3f
+03 17 00 00 32 00 00 00 00 00 #40
+
+03 17 00 00 00 fa 00 00 00 00 #41
+03 17 00 00 00 05 00 00 00 00 #42
+03 17 00 00 00 f0 00 00 00 00 #43
+03 17 00 00 00 0f 00 00 00 00 #44
+
 
 mem_shutter_move_data:
 00 00 00  #defualt
@@ -434,23 +454,18 @@
 #0d 09 56 30 2d 53 68 75 74 74 65 72
 
 mem_ble_shutter_dy_interval_min_new:
-13 00
-18 00
+06 00
+0a 00
 10 00
 2c 01
 
-# mem_ble_shutter_dy_interval_min_new_drag:
-# 06 00
-# 06 00
-# 10 00
-# 2c 01
-
 mem_ble_shutter_dy_interval_min_ios:
-13 00
-18 00
+0f 00
+0f 00
 10 00
 2c 01
 
+
 #attribute list: handle 2bytes, uuid 2bytes, length 1bytes, attribute Nbytes
 mem_shutter_le_uuid_sup:
 #Primary service GATT ------
Index: program/patch.prog
===================================================================
--- /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/program/patch.prog	(revision 6309)
+++ /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/program/patch.prog	(working copy)
@@ -107,21 +107,63 @@
 	branch lpm_adjust_clk+6
 
 p_shutter_dy_keyscan_key_check_long_press:
-	call p_shutter_dy_long_key_function
-	rtnne SHUTTER_MOVE_KEY_NUM
-	fetch 1,mem_move_mode_set
-	beq MOVE_COMBINE_KEY,shutter_dy_key_long_press_set_key_normal
-	beq MOVE_SINGLE_KEY,shutter_dy_key_long_press_set_move_trigger
+	fetch 1,mem_move_mode_trigger_enable
+	nbranch p_long_key_move_function,blank
+	copy queue,pdata
+	beq SHUTTER_DOWN_KEY_NUM,shutter_dy_loop_send_volume_dec_page
+	beq SHUTTER_UP_KEY_NUM,shutter_dy_loop_send_volume_inc_page
+	beq SHUTTER_LIKE_KEY_NUM,shutter_dy_link_key_long_press
+	beq SHUTTER_RIGHT_KEY_NUM,p_shutter_right_key_long_press
+	beq SHUTTER_LEFT_KEY_NUM,p_shutter_left_key_long_press
+	// beq SHUTTER_UP_KEY_NUM,p_shutter_dy_drag_up_event
+	// beq SHUTTER_DOWN_KEY_NUM,p_shutter_dy_drag_drown_event
 	rtn
 
-p_shutter_dy_long_key_function:
+p_shutter_right_key_long_press:
+	call p_shutter_right_key_long_press_ptr
+	branch push_buffer_in_queue
+
+p_shutter_right_key_long_press_ptr:
+	arg mem_key0_long_press,regc
+	call shutter_dy_check_iphone
+	rtn blank
+	arg mem_key0_long_press_i,regc
+	rtn
+
+p_shutter_left_key_long_press:
+	arg mem_key5_long_press,regc
+	branch push_buffer_in_queue
+
+p_long_key_move_function:
 	copy queue,pdata
-	beq SHUTTER_LEFT_KEY_NUM,shutter_dy_loop_send_volume_dec_page
-	beq SHUTTER_RIGHT_KEY_NUM,shutter_dy_loop_send_volume_inc_page
-	// beq SHUTTER_LIKE_KEY_NUM,shutter_dy_link_key_long_press
-	beq SHUTTER_UP_KEY_NUM,p_shutter_dy_drag_up_event
-	beq SHUTTER_DOWN_KEY_NUM,p_shutter_dy_drag_drown_event
+	beq SHUTTER_UP_KEY_NUM,p_long_move_up
+	beq SHUTTER_DOWN_KEY_NUM,p_long_move_down
+	beq SHUTTER_RIGHT_KEY_NUM,p_long_move_right
+	beq SHUTTER_LEFT_KEY_NUM,p_long_move_left
+	beq SHUTTER_LIKE_KEY_NUM,shutter_dy_link_key_long_press
+	rtn
+
+p_long_move_up:
+	jam 0x01,mem_shutter_move_timer
+	jam SHUTTER_UP_KEY_NUM,mem_shutter_move_state
 	rtn
+
+p_long_move_down:
+	jam 0x01,mem_shutter_move_timer
+	jam SHUTTER_DOWN_KEY_NUM,mem_shutter_move_state
+	rtn
+
+p_long_move_right:
+	jam 0x01,mem_shutter_move_timer
+	jam SHUTTER_RIGHT_KEY_NUM,mem_shutter_move_state
+	rtn
+
+p_long_move_left:
+	jam 0x01,mem_shutter_move_timer
+	jam SHUTTER_LEFT_KEY_NUM,mem_shutter_move_state
+	rtn
+
+
 p_shutter_dy_keyscan_key_process_next:
 	fetch 1,mem_move_mode_set
 	beq MOVE_SINGLE_KEY,shutter_dy_skip_check_combine_key
@@ -176,7 +218,8 @@
 	nbranch shutter_dy_key_value_filter,blank
 p_shutter_dy_key_press_next:
 	jam 1,mem_shutter_key_pressed
-	call app_led_on
+	fetch 1,mem_move_mode_trigger_enable
+	call app_led_on,blank
 	call shutter_dy_key_press_clk
 	call shutter_dy_jude_queue_size
 	branch shutter_dy_over_clear,positive
@@ -184,8 +227,10 @@
 	fetcht 1,mem_last_press_key_value
 	isub temp,null
 	ncall p_shutter_dy_iphone_check_move_mid,zero
-	fetch 1,mem_move_mode_trigger_enable
-	ncall p_shutter_short_key_cancel,blank
+	// fetch 1,mem_move_mode_trigger_enable
+	// ncall p_shutter_short_key_cancel,blank
+	call p_shutter_move_enable
+	// jam 0,mem_shutter_move_cancle_flag
 	copy queue,pdata
 	store 1,mem_last_press_key_value
 	fetcht 1,mem_move_mode_key_index
@@ -195,6 +240,16 @@
 	nbranch p_shutter_dy_move_set,blank
 	branch shutter_dy_page_set
 
+p_shutter_move_enable:
+	// fetch 1,mem_shutter_move_cancle_flag
+	// nrtn blank
+	copy queue,pdata
+	rtnne SHUTTER_MOVE_KEY_NUM
+	fetch 1,mem_move_mode_trigger_enable
+	setflip 0,pdata
+	store 1,mem_move_mode_trigger_enable
+	rtn
+
 p_shutter_dy_key_move_to_specify_location:
 	jam 1,mem_shutter_first_move
 	branch p_shutter_dy_move_to_specify_location
@@ -520,8 +575,10 @@
 	// branch shutter_dy_store_move_config_info
 
 p_shutter_short_key_cancel:
+	jam 1,mem_shutter_move_cancle_flag
 	copy queue,pdata
 	beq SHUTTER_MOVE_KEY_NUM,p_move_mode_disable
+	beq SHUTTER_LIKE_KEY_NUM,p_move_mode_disable
 	rtn
 
 p_move_mode_disable:
@@ -627,10 +684,13 @@
 	rtn
 
 p_shutter_dy_clear_volume_timer:
-	call p_shutter_dy_clear_drag
+	// call p_shutter_dy_clear_drag
+	jam 0,mem_shutter_move_timer
+	jam 0xff,mem_shutter_move_state
 	jam 0,mem_key3_press_count
 	jam 0, mem_shutter_volume_timer
 	rtn
+
 p_main_loop:
 	ifdef SECURE_CONNECTION
 	call sp_calc_sequence_256
@@ -856,10 +916,12 @@
 p_shutter_dy_init:
 	call enable_authrom
 	rtn wake
+	call wdt_set_disable
+	call app_param_init
+	// jam 0,mem_lpm_mode
 	call shutter_dy_key_conf
 	call shutter_dy_adv_conf
 	jam 0x0a,mem_lpm_overhead
-	call wdt_set_disable
 	setarg p_shutter_dy_process_idle
 	store 2,mem_cb_idle_process
 
@@ -918,16 +980,47 @@
 
 
 p_shutter_dy_le_bb_event_timer:
-	call p_shutter_long_key_drag_timer
+	// call p_shutter_long_key_drag_timer
+	call p_shutter_long_key_move_timer
 	call p_shutter_move_led_timer
 	call shutter_dy_shutter_1s_timer
-	// call shutter_dy_link_key_loop_timer
+	call shutter_dy_link_key_loop_timer
 	call shutter_dy_long_key_volume_timer
 	call shutter_dy_iphone_move_mid_timer
 	call shutter_dy_clear_key_state_timer
 	call shutter_check_sleep_timer
 	branch shutter_dy_check_power_off_timer
 
+p_shutter_long_key_move_timer:
+	arg mem_shutter_move_timer,regc
+	arg p_shutter_long_key_move_timeout,regb
+	branch timer_single_step
+
+p_shutter_long_key_move_timeout:
+	jam 0x02,mem_shutter_move_timer
+	fetch 1,mem_shutter_move_state
+	beq SHUTTER_UP_KEY_NUM,p_long_move_up_next
+	beq SHUTTER_DOWN_KEY_NUM,p_long_move_down_next
+	beq SHUTTER_RIGHT_KEY_NUM,p_long_move_right_next
+	beq SHUTTER_LEFT_KEY_NUM,p_long_move_left_next
+	rtn
+
+p_long_move_up_next:
+	call p_move_up
+	branch p_shutter_dy_move_to_specify_location
+
+p_long_move_down_next:
+	call p_move_down
+	branch p_shutter_dy_move_to_specify_location
+
+p_long_move_right_next:
+	call p_move_right
+	branch p_shutter_dy_move_to_specify_location
+
+p_long_move_left_next:
+	call p_move_left
+	branch p_shutter_dy_move_to_specify_location
+
 // p_shutter_dy_drag_set_interval:
 // 	call shutter_dy_check_iphone
 // 	nbranch p_shutter_dy_drag_set_interval_ios,blank
@@ -940,161 +1033,161 @@
 // 	rtn
 
 //drag timer
-p_shutter_long_key_drag_timer:
-	arg mem_shutter_drag_timer,regc
-	arg p_shutter_long_key_drag_timeout,regb
-	branch timer_single_step
-
-p_shutter_long_key_drag_timeout:
-	// call p_shutter_dy_drag_set_interval
-	fetch 1,mem_shutter_dy_drag_flag
-	beq DRAG_UP,p_shutter_dy_drag_up_event
-	beq DRAG_DOWN,p_shutter_dy_drag_drown_event
-	rtn
-p_shutter_dy_drag_up_event:
-	jam DRAG_UP,mem_shutter_dy_drag_flag
-	call shutter_dy_check_iphone
-	nbranch p_shutter_dy_drag_up_event_ios,blank
-	fetch 1,mem_shutter_drag_reset_flag
-	ncall p_shutter_dy_drag_up_init_next,blank
-	jam 0,mem_shutter_drag_reset_flag
-	jam 1,mem_shutter_drag_timer
-	jam 10,mem_send_data_delay
-	fetch 1,mem_shutter_dy_drag_count
-	increase 1,pdata
-	store 1,mem_shutter_dy_drag_count
-	sub pdata,90,null
-	branch p_shutter_dy_drag_up_init,zero
-	arg mem_shutter_dy_up_long_press,regb
-	arg mem_shutter_mousekey_value_list,temp
-	ifetch 1,regb
-	increase -1,pdata
-	mul32 pdata,10,pdata
-	iadd temp,contr
-	increase 6,contr
-	copy contr,rega
-	ifetch 2,contr
-	increase 30,pdata
-	istore 2,rega
-	arg mem_shutter_dy_up_long_press,regc
-	branch push_buffer_in_queue
-
-p_shutter_dy_drag_up_init:
-	jam 0,mem_shutter_dy_drag_count
-	arg mem_shutter_dy_drag_up_release,regc
-	call push_buffer_in_queue
-p_shutter_dy_drag_up_init_next:
-	arg mem_shutter_dy_up_long_press,regb
-	arg mem_shutter_mousekey_value_list,temp
-	ifetch 1,regb
-	increase -1,pdata
-	mul32 pdata,10,pdata
-	iadd temp,rega
-	increase 6,rega
-	setarg 0x01f0
-	istore 2,rega
-	rtn
-
-
-p_shutter_dy_drag_up_event_ios:
-	jam 2,mem_shutter_drag_timer
-	fetch 1,mem_shutter_drag_count
-	increase 1,pdata
-	store 1,mem_shutter_drag_count
-	sub pdata,40,null
-	branch p_shutter_drag_init_flag,zero
-	fetch 1,mem_allow_enter_init_flag
-	nbranch p_shutter_drag_up_init,blank
-	jam 1,mem_shutter_drag_timer
-	jam 0,mem_last_press_key_value
-	jam 20,mem_send_data_delay
-	arg mem_key4_long_press_i_drag,regc
-	branch push_buffer_in_queue
-
-p_shutter_drag_up_init:
-	jam 0,mem_shutter_drag_count
-	jam 0,mem_allow_enter_init_flag
-	jam 4,mem_shutter_drag_timer
-	arg mem_dy_ios_release,regc
-	call push_buffer_in_queue
-	jam 240,mem_send_data_delay
-	arg mem_shutter_iphone_up_drag_mid,regc
-	branch push_buffer_in_queue
+// p_shutter_long_key_drag_timer:
+// 	arg mem_shutter_drag_timer,regc
+// 	arg p_shutter_long_key_drag_timeout,regb
+// 	branch timer_single_step
+
+// p_shutter_long_key_drag_timeout:
+// 	// call p_shutter_dy_drag_set_interval
+// 	fetch 1,mem_shutter_dy_drag_flag
+// 	beq DRAG_UP,p_shutter_dy_drag_up_event
+// 	beq DRAG_DOWN,p_shutter_dy_drag_drown_event
+// 	rtn
+// p_shutter_dy_drag_up_event:
+// 	jam DRAG_UP,mem_shutter_dy_drag_flag
+// 	call shutter_dy_check_iphone
+// 	nbranch p_shutter_dy_drag_up_event_ios,blank
+// 	fetch 1,mem_shutter_drag_reset_flag
+// 	ncall p_shutter_dy_drag_up_init_next,blank
+// 	jam 0,mem_shutter_drag_reset_flag
+// 	jam 1,mem_shutter_drag_timer
+// 	jam 10,mem_send_data_delay
+// 	fetch 1,mem_shutter_dy_drag_count
+// 	increase 1,pdata
+// 	store 1,mem_shutter_dy_drag_count
+// 	sub pdata,90,null
+// 	branch p_shutter_dy_drag_up_init,zero
+// 	arg mem_shutter_dy_up_long_press,regb
+// 	arg mem_shutter_mousekey_value_list,temp
+// 	ifetch 1,regb
+// 	increase -1,pdata
+// 	mul32 pdata,10,pdata
+// 	iadd temp,contr
+// 	increase 6,contr
+// 	copy contr,rega
+// 	ifetch 2,contr
+// 	increase 30,pdata
+// 	istore 2,rega
+// 	arg mem_shutter_dy_up_long_press,regc
+// 	branch push_buffer_in_queue
+
+// p_shutter_dy_drag_up_init:
+// 	jam 0,mem_shutter_dy_drag_count
+// 	arg mem_shutter_dy_drag_up_release,regc
+// 	call push_buffer_in_queue
+// p_shutter_dy_drag_up_init_next:
+// 	arg mem_shutter_dy_up_long_press,regb
+// 	arg mem_shutter_mousekey_value_list,temp
+// 	ifetch 1,regb
+// 	increase -1,pdata
+// 	mul32 pdata,10,pdata
+// 	iadd temp,rega
+// 	increase 6,rega
+// 	setarg 0x01f0
+// 	istore 2,rega
+// 	rtn
 
-p_shutter_drag_init_flag:
-	jam 0,mem_shutter_drag_count
-	jam 1,mem_allow_enter_init_flag
-	jam 8,mem_shutter_drag_timer
-	rtn
 
-p_shutter_dy_drag_drown_event:
-	jam DRAG_DOWN,mem_shutter_dy_drag_flag
-	call shutter_dy_check_iphone
-	nbranch p_shutter_dy_drag_down_event_ios,blank
-	fetch 1,mem_shutter_drag_reset_flag
-	ncall p_shutter_dy_drag_drown_init_next,blank
-	jam 0,mem_shutter_drag_reset_flag
-	jam 1,mem_shutter_drag_timer
-	jam 10,mem_send_data_delay
-	fetch 1,mem_shutter_dy_drag_count
-	increase 1,pdata
-	store 1,mem_shutter_dy_drag_count
-	sub pdata,90,null
-	branch p_shutter_dy_drag_down_init,zero
-	arg mem_shutter_dy_down_long_press,regb
-	arg mem_shutter_mousekey_value_list,temp
-	ifetch 1,regb
-	increase -1,pdata
-	mul32 pdata,10,pdata
-	iadd temp,contr
-	increase 6,contr
-	copy contr,rega
-	ifetch 2,contr
-	increase -30,pdata
-	istore 2,rega
-	arg mem_shutter_dy_down_long_press,regc
-	branch push_buffer_in_queue
+// p_shutter_dy_drag_up_event_ios:
+// 	jam 2,mem_shutter_drag_timer
+// 	fetch 1,mem_shutter_drag_count
+// 	increase 1,pdata
+// 	store 1,mem_shutter_drag_count
+// 	sub pdata,40,null
+// 	branch p_shutter_drag_init_flag,zero
+// 	fetch 1,mem_allow_enter_init_flag
+// 	nbranch p_shutter_drag_up_init,blank
+// 	jam 1,mem_shutter_drag_timer
+// 	jam 0,mem_last_press_key_value
+// 	jam 20,mem_send_data_delay
+// 	arg mem_key4_long_press_i_drag,regc
+// 	branch push_buffer_in_queue
+
+// p_shutter_drag_up_init:
+// 	jam 0,mem_shutter_drag_count
+// 	jam 0,mem_allow_enter_init_flag
+// 	jam 4,mem_shutter_drag_timer
+// 	arg mem_dy_ios_release,regc
+// 	call push_buffer_in_queue
+// 	jam 240,mem_send_data_delay
+// 	arg mem_shutter_iphone_up_drag_mid,regc
+// 	branch push_buffer_in_queue
+
+// p_shutter_drag_init_flag:
+// 	jam 0,mem_shutter_drag_count
+// 	jam 1,mem_allow_enter_init_flag
+// 	jam 8,mem_shutter_drag_timer
+// 	rtn
 
-p_shutter_dy_drag_down_init:
-	jam 0,mem_shutter_dy_drag_count
-	arg mem_dy_android_release,regc
-	call push_buffer_in_queue
-p_shutter_dy_drag_drown_init_next:
-	arg mem_shutter_dy_down_long_press,regb
-	arg mem_shutter_mousekey_value_list,temp
-	ifetch 1,regb
-	increase -1,pdata
-	mul32 pdata,10,pdata
-	iadd temp,rega
-	increase 6,rega
-	setarg 0x0bf0
-	istore 2,rega
-	rtn
-
-p_shutter_dy_drag_down_event_ios:
-	jam 2,mem_shutter_drag_timer
-	fetch 1,mem_shutter_drag_count
-	increase 1,pdata
-	store 1,mem_shutter_drag_count
-	sub pdata,30,null
-	branch p_shutter_drag_init_flag,zero
-	fetch 1,mem_allow_enter_init_flag
-	nbranch p_shutter_drag_down_init,blank
-	jam 1,mem_shutter_drag_timer
-	jam 0,mem_last_press_key_value
-	jam 20,mem_send_data_delay
-	arg mem_key2_long_press_i_drag,regc
-	branch push_buffer_in_queue
+// p_shutter_dy_drag_drown_event:
+// 	jam DRAG_DOWN,mem_shutter_dy_drag_flag
+// 	call shutter_dy_check_iphone
+// 	nbranch p_shutter_dy_drag_down_event_ios,blank
+// 	fetch 1,mem_shutter_drag_reset_flag
+// 	ncall p_shutter_dy_drag_drown_init_next,blank
+// 	jam 0,mem_shutter_drag_reset_flag
+// 	jam 1,mem_shutter_drag_timer
+// 	jam 10,mem_send_data_delay
+// 	fetch 1,mem_shutter_dy_drag_count
+// 	increase 1,pdata
+// 	store 1,mem_shutter_dy_drag_count
+// 	sub pdata,90,null
+// 	branch p_shutter_dy_drag_down_init,zero
+// 	arg mem_shutter_dy_down_long_press,regb
+// 	arg mem_shutter_mousekey_value_list,temp
+// 	ifetch 1,regb
+// 	increase -1,pdata
+// 	mul32 pdata,10,pdata
+// 	iadd temp,contr
+// 	increase 6,contr
+// 	copy contr,rega
+// 	ifetch 2,contr
+// 	increase -30,pdata
+// 	istore 2,rega
+// 	arg mem_shutter_dy_down_long_press,regc
+// 	branch push_buffer_in_queue
+
+// p_shutter_dy_drag_down_init:
+// 	jam 0,mem_shutter_dy_drag_count
+// 	arg mem_dy_android_release,regc
+// 	call push_buffer_in_queue
+// p_shutter_dy_drag_drown_init_next:
+// 	arg mem_shutter_dy_down_long_press,regb
+// 	arg mem_shutter_mousekey_value_list,temp
+// 	ifetch 1,regb
+// 	increase -1,pdata
+// 	mul32 pdata,10,pdata
+// 	iadd temp,rega
+// 	increase 6,rega
+// 	setarg 0x0bf0
+// 	istore 2,rega
+// 	rtn
 
-p_shutter_drag_down_init:
-	jam 0,mem_shutter_drag_count
-	jam 0,mem_allow_enter_init_flag
-	jam 4,mem_shutter_drag_timer
-	arg mem_dy_ios_release,regc
-	call push_buffer_in_queue
-	jam 240,mem_send_data_delay
-	arg mem_shutter_iphone_down_drag_mid,regc
-	branch push_buffer_in_queue
+// p_shutter_dy_drag_down_event_ios:
+// 	jam 2,mem_shutter_drag_timer
+// 	fetch 1,mem_shutter_drag_count
+// 	increase 1,pdata
+// 	store 1,mem_shutter_drag_count
+// 	sub pdata,30,null
+// 	branch p_shutter_drag_init_flag,zero
+// 	fetch 1,mem_allow_enter_init_flag
+// 	nbranch p_shutter_drag_down_init,blank
+// 	jam 1,mem_shutter_drag_timer
+// 	jam 0,mem_last_press_key_value
+// 	jam 20,mem_send_data_delay
+// 	arg mem_key2_long_press_i_drag,regc
+// 	branch push_buffer_in_queue
+
+// p_shutter_drag_down_init:
+// 	jam 0,mem_shutter_drag_count
+// 	jam 0,mem_allow_enter_init_flag
+// 	jam 4,mem_shutter_drag_timer
+// 	arg mem_dy_ios_release,regc
+// 	call push_buffer_in_queue
+// 	jam 240,mem_send_data_delay
+// 	arg mem_shutter_iphone_down_drag_mid,regc
+// 	branch push_buffer_in_queue
 
 p_shutter_move_led_timer:
 	fetch 1,mem_move_mode_trigger_enable
@@ -1105,11 +1198,12 @@
 
 p_shutter_move_led_timeout:
 	jam 0x05,mem_shutter_move_led_timer
-	fetch 1,mem_shutter_move_led_flag
-	setflip 0,pdata
-	store 1,mem_shutter_move_led_flag
-	beq 0,app_led_on
-	beq 1,app_led_off
+	// fetch 1,mem_shutter_move_led_flag
+	// setflip 0,pdata
+	// store 1,mem_shutter_move_led_flag
+	// beq 0,app_led_on
+	// beq 1,app_led_off
+	call app_led_on
 	rtn
 
 p_shutter_dy_process_bb_event:
@@ -1268,9 +1362,7 @@
 	rtn blank
 	arg mem_key0_release_new_i,regc
 	copy queue,pdata
-	jam 90,mem_send_data_delay
-	rtneq SHUTTER_LIKE_KEY_NUM
-	// jam 230,mem_send_data_delay
+	jam 1,mem_send_data_delay
 	rtn
 
 p_rx_dcoc:
Index: sched/shutter_dy.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/sched/shutter_dy.dat	(revision 6309)
+++ /1121s/branch/shutter/branch/dy/Xinfeiyi/yc1088s_xfy_drag_7key/sched/shutter_dy.dat	(working copy)
@@ -5,11 +5,11 @@
 
 mem_le_lap:1a 21 20 98 07 2a
 mem_le_name_len:
-'Controller-R1
+'Beauty-R1
 
 mem_tx_power:06
 
-#save otp addr
+//save otp addr
 mem_shutter_efuse_start_offset:b0 1f
 mem_shutter_efuse_end_offset:f0 1b
 
@@ -31,14 +31,14 @@
 00		#type:stop blink
 00		#blink count:no blink
 # 8c		#led gpio number:GPIO01
-8a
+86
 46 00	#led blink light time
 96 00	#led blink dark time
 mem_shutter_led_off_light_dark_led_conf:
 01		#type:start blink
 03		#blink count:no blink
 # 8c		#led gpio number:GPIO01
-8a
+86
 46 00	#led blink light time
 96 00	#led blink dark time
 
@@ -87,13 +87,13 @@
 # 0d   #move
 
 #xfy 1088s
-06	  #right
-0d	  #like
-0f    #down
-0c    #photo
+0f	  #right
+12	  #like
+08    #down
+07    #photo
 14	  #up
-12    #left
-07	  #move
+0c    #left
+0d	  #move
 
 
 
@@ -132,19 +132,23 @@
 #7key
 40 00
 
-mem_shutter_iphone_move_mid:
-12 12 13 14 0b 0b 00
+mem_shutter_iphone_move_mid:#设为00,退出move后,按move键不会跳转光标
+# 12 12 13 14 0b 0b 00
+00
 mem_shutter_iphone_up_mid:
-12 12 13 2d 0b 0b 00
+# 12 12 13 2d 0b 0b 00
+00
 mem_shutter_iphone_like_mid:
 12 12 13 2e 0b 0b 00
+# 00
 mem_shutter_android_move_mid:
 00
 
 mem_key0_press_i:  #right
 00
 mem_key0_release_new_i:
-0a 0e 0e 0e 0b 0d 0d 0d 00
+# 0a 0e 0e 0e 0b 0d 0d 0d 00
+23 24 25 26 27 28 29 2a 2b
 mem_key0_long_press_i:
 33 09 00
 
@@ -155,49 +159,55 @@
 
 mem_shutter_link_data_i:
 0a 0b 0a 0b 00
+# 1c 2c 1c 2c 00
 
 mem_key2_press_i:#down
 00
 mem_key2_release_new_i:
-0a 10 10 10 0b 0f 0f 0f 00
-
+# 0a 10 10 10 0b 0f 0f 0f 00
+20 1f 1e 1d 1c 1b 1a 19 21
 
 #toggle between vol-inc and vol-dec
 mem_key3_press_i:#photo
 00
 mem_key3_release_new_i:#volume increment
-33 09 00
+07 0a 09 0b 00
 mem_key3_release_new_i_t:#volume decrement
-33 09 00
+08 0a 09 0b 00
 
 mem_key4_press_i:#up
 00
 mem_key4_release_new_i:
-0a 0f 0f 0f 0b 10 10 10 00
+# 0a 0f 0f 0f 0b 10 10 10 00
+19 1a 1b 1c 1d 1e 1f 20 21
 
 mem_key5_press_i:#left
 00
 mem_key5_release_new_i:
-0a 0d 0d 0d 0b 0e 0e 0e 00
+# 0a 0d 0d 0d 0b 0e 0e 0e 00
+2b 2a 29 28 27 26 25 24 23 22
 mem_key5_long_press_i: #lock
 32 09 00
 
 
 mem_key6_release_new_i:#move
-0a 0b 00
+# 0a 0b 00
+00
 mem_key6_release_new:#move
-18 35 00
+# 18 35 00
+00
 mem_dy_key0_press:  #right
 00
 mem_key0_release_new:
 23 24 25 26 27 28 29 2a 2b
 mem_key0_long_press:
-00
+34 09 00
 
 mem_dy_key1_press:#like
 00
 mem_key1_release_new:
-1c 2c
+1c 2c 00
+# 18 36 00
 mem_shutter_link_data:
 1c 2c 1c 2c 00
 
@@ -213,9 +223,9 @@
 mem_dy_key3_press:#photo
 00
 mem_key3_release_new:#volume increment
-34 09 00
+07 18 09 35 00
 mem_key3_release_new_t:#volume decrement
-34 09 00
+08 18 09 35 00
 
 mem_dy_key4_press:#up
 00
@@ -229,29 +239,29 @@
 mem_dy_key5_press:#left
 00
 mem_key5_release_new:
-44 29 28 27 26 25 24 23 43 42 41
+2b 2a 29 28 27 26 25 24 23 22
 mem_key5_long_press: #lock
-00
-
-mem_shutter_dy_up_long_press:
-3d 00
-mem_shutter_dy_down_long_press:
-3f 00
-mem_shutter_dy_drag_up_release:
-3e 00
-mem_dy_android_release:
-40 00
+32 09 00
 
-mem_dy_ios_release:
-0b 00
-mem_shutter_iphone_down_drag_mid:
-12 12 3a 39 0b 00
-mem_key2_long_press_i_drag:
-0a 3b 3b 3b 3c 00
-mem_shutter_iphone_up_drag_mid:
-12 12 3a 38 0b 00
-mem_key4_long_press_i_drag:
-0a 37 37 37 36 00
+# mem_shutter_dy_up_long_press:
+# 3d 00
+# mem_shutter_dy_down_long_press:
+# 3f 00
+# mem_shutter_dy_drag_up_release:
+# 3e 00
+# mem_dy_android_release:
+# 40 00
+
+# mem_dy_ios_release:
+# 0b 00
+# mem_shutter_iphone_down_drag_mid:
+# 12 12 3a 39 0b 00
+# mem_key2_long_press_i_drag:
+# 0a 3b 3b 3b 3c 00
+# mem_shutter_iphone_up_drag_mid:
+# 12 12 3a 38 0b 00
+# mem_key4_long_press_i_drag:
+# 0a 37 37 37 36 00
 
 
 mem_combine_key0_press:
@@ -337,24 +347,34 @@
 
 05 23 00 06 00 00 00 00 00 00 #35
 
-07 13 00 00 06 70 07 78 05 00 #36
-03 1f 00 00 40 00 00 00 00 00 #37         
-03 1f 00 3c 40 04 00 00 00 00 #38        
+05 23 00 00 00 00 00 00 00 00 #36
+03 1f 00 00 40 00 00 00 00 00 #37
+03 1f 00 3c 40 04 00 00 00 00 #38
 03 1f 00 3c 40 15 00 00 00 00 #39
-03 1f 00 00 10 80 00 00 00 00 #3a               
-03 1f 00 00 c0 ff 00 00 00 00 #3b             
-07 13 00 07 06 70 07 ac 0d 01 #3c 
-
-05 23 00 07 00 03 f0 01 00 00 #3d drag up
-05 23 00 00 00 03 f0 01 00 00 #3e
-05 23 00 07 00 03 f0 0b 00 00 #3f drag down
-05 23 00 00 00 03 f0 0a 00 00 #40
-
-05 23 00 00 e0 06 50 06 00 00 #41 
-05 23 00 07 e0 06 50 06 00 00 #42
-05 23 00 07 18 06 50 06 00 00 #43
-05 23 00 07 3a 01 50 06 00 00 #44
-              
+03 1f 00 00 10 80 00 00 00 00 #3a
+03 1f 00 00 c0 ff 00 00 00 00 #3b
+07 13 00 07 06 70 07 ac 0d 01 #3c
+
+# 05 23 00 07 00 03 f0 01 00 00 #3d drag up
+# 05 23 00 00 00 03 f0 01 00 00 #3e
+# 05 23 00 07 00 03 f0 0b 00 00 #3f drag down
+# 05 23 00 00 00 03 f0 0a 00 00 #40
+
+# 05 23 00 00 e0 06 50 06 00 00 #41
+# 05 23 00 07 e0 06 50 06 00 00 #42
+# 05 23 00 07 18 06 50 06 00 00 #43
+# 05 23 00 07 3a 01 50 06 00 00 #44
+
+03 17 00 00 fa 00 00 00 00 00 #3d
+03 17 00 00 28 00 00 00 00 00 #3e
+03 17 00 00 d2 00 00 00 00 00 #3f
+03 17 00 00 32 00 00 00 00 00 #40
+
+03 17 00 00 00 fa 00 00 00 00 #41
+03 17 00 00 00 05 00 00 00 00 #42
+03 17 00 00 00 f0 00 00 00 00 #43
+03 17 00 00 00 0f 00 00 00 00 #44
+
 
 mem_shutter_move_data:
 00 00 00  #defualt
@@ -367,23 +387,18 @@
 #0d 09 56 30 2d 53 68 75 74 74 65 72
 
 mem_ble_shutter_dy_interval_min_new:
-13 00
-18 00
+06 00
+0a 00
 10 00
 2c 01
 
-# mem_ble_shutter_dy_interval_min_new_drag:
-# 06 00
-# 06 00
-# 10 00
-# 2c 01
-
 mem_ble_shutter_dy_interval_min_ios:
-13 00
-18 00
+0f 00
+0f 00
 10 00
 2c 01
 
+
 #attribute list: handle 2bytes, uuid 2bytes, length 1bytes, attribute Nbytes
 mem_shutter_le_uuid_sup:
 #Primary service GATT ------