Index: format/app_shutter_dy.format
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/format/app_shutter_dy.format	(revision 3203)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/format/app_shutter_dy.format	(working copy)
@@ -191,13 +191,12 @@
 1 mem_shutter_dy_photo_count
 3 mem_shutter_dy_mode_step_android
 3 mem_shutter_dy_mode_step_ios
-1 mem_shutter_dy_photo_mode_flag
 1 mem_shutter_loop_send_fouse
 1 mem_shutter_zoomup_time
 10 mem_shutter_dy_fouse_up
 10 mem_shutter_dy_fouse_down
 
-
+3 mem_shutter_dy_ios_mode_step
 0 mem_shutter_dy_end
 )
 (
Index: output/otp.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/output/otp.dat	(revision 3203)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/output/otp.dat	(working copy)
@@ -11,8 +11,8 @@
 00
 aa
 55
-1a
-0c
+f6
+0b
 c2
 84
 00
@@ -24,35 +24,35 @@
 c0
 01
 00
-cc
+cf
 c0
 08
 80
-d5
+d8
 c0
 0a
 02
-c5
+bc
 c0
 0a
 81
-61
+64
 c0
 0c
 01
-6f
+72
 c0
 0c
 81
-2e
+31
 c0
 0d
 00
-e7
+ea
 c0
 12
 82
-e7
+de
 c0
 13
 80
@@ -60,11 +60,11 @@
 c0
 51
 80
-6a
+65
 c0
 52
 80
-b3
+b6
 c0
 53
 00
@@ -72,23 +72,23 @@
 c0
 55
 00
-a2
+a5
 c0
 58
 81
-79
+7c
 c0
 62
 81
-76
+79
 c0
 6d
 02
-96
+8d
 c0
 6e
 02
-a6
+9d
 20
 20
 23
@@ -100,19 +100,19 @@
 c0
 12
 80
-8b
+8e
 c0
 13
 00
-90
+93
 c0
 1c
 82
-e1
+d8
 c0
 26
 82
-e5
+dc
 c1
 7f
 80
@@ -346,77 +346,73 @@
 7e
 00
 c0
-00
-e7
-77
-c0
-02
-e7
+01
+67
 65
 c0
-00
+02
 67
 61
 c0
-01
-80
-66
+00
+00
+5d
 c0
 02
-00
-5a
+80
+61
 c0
-01
 00
-60
+80
+59
 20
 60
 00
 00
-6f
-e0
-cf
-c0
+20
+40
+67
+30
 20
 7a
 00
 00
+da
+60
+4b
+c3
+20
+20
+63
+71
 70
 4f
-c1
+c0
 01
 70
 4f
-c2
+c1
 02
 da
 60
 4f
-c3
+c2
 20
 20
 63
 71
-6f
-e0
-cf
-c0
-20
-7a
-00
-00
 70
 4f
-c1
+c0
 02
 70
 4f
-c2
+c1
 02
 da
 60
 4f
-cd
+cc
 20
 20
 63
@@ -424,22 +420,6 @@
 6f
 e0
 cf
-c0
-79
-40
-7e
-00
-67
-e0
-cf
-c0
-20
-60
-00
-00
-6f
-e0
-cf
 9f
 24
 3a
@@ -480,7 +460,7 @@
 24
 42
 80
-81
+84
 6f
 e0
 ce
@@ -488,7 +468,7 @@
 24
 5a
 00
-7c
+7f
 18
 e2
 7e
@@ -506,9 +486,41 @@
 00
 00
 20
+40
+00
+79
+df
+e0
+00
+0a
+20
 20
 65
-1c
+5a
+da
+60
+4f
+14
+20
+40
+67
+30
+20
+7a
+00
+00
+70
+49
+e5
+0a
+da
+60
+4b
+1b
+20
+60
+00
+00
 18
 e2
 7e
@@ -516,7 +528,7 @@
 c0
 03
 00
-7f
+82
 20
 60
 00
@@ -536,7 +548,7 @@
 20
 3a
 00
-84
+87
 20
 20
 65
@@ -548,7 +560,7 @@
 20
 3a
 00
-87
+8a
 20
 20
 64
@@ -680,7 +692,7 @@
 c0
 00
 80
-a8
+ab
 20
 20
 66
@@ -696,7 +708,7 @@
 c0
 03
 00
-ac
+af
 20
 60
 00
@@ -704,7 +716,7 @@
 20
 40
 00
-ae
+b1
 20
 20
 67
@@ -788,7 +800,7 @@
 24
 3a
 00
-c3
+c6
 20
 20
 65
@@ -804,7 +816,7 @@
 20
 40
 00
-c9
+cc
 da
 60
 4a
@@ -819,11 +831,11 @@
 5a
 70
 4f
-c1
+c0
 00
 70
 4f
-c2
+c1
 00
 20
 20
@@ -864,7 +876,7 @@
 20
 20
 00
-cc
+cf
 70
 8a
 0f
@@ -980,7 +992,7 @@
 20
 40
 01
-36
+39
 6f
 e0
 c4
@@ -992,7 +1004,7 @@
 24
 55
 80
-e3
+e6
 37
 d9
 82
@@ -1008,7 +1020,7 @@
 c0
 08
 01
-23
+26
 6f
 e0
 c4
@@ -1052,7 +1064,7 @@
 20
 40
 01
-15
+18
 70
 80
 43
@@ -1076,15 +1088,15 @@
 20
 40
 02
-68
+5f
 20
 40
 02
-93
+8a
 20
 40
 01
-0f
+12
 70
 41
 48
@@ -1096,7 +1108,7 @@
 20
 20
 02
-95
+8c
 20
 75
 80
@@ -1128,7 +1140,7 @@
 c0
 0c
 01
-1b
+1e
 6f
 e0
 c4
@@ -1220,7 +1232,7 @@
 20
 20
 01
-01
+04
 6f
 e0
 c1
@@ -1228,7 +1240,7 @@
 c0
 05
 01
-31
+34
 20
 20
 22
@@ -1256,7 +1268,7 @@
 20
 35
 81
-5d
+60
 6f
 e2
 02
@@ -1424,7 +1436,7 @@
 20
 20
 01
-47
+4a
 20
 40
 68
@@ -1544,7 +1556,7 @@
 58
 00
 02
-10
+12
 67
 e1
 43
@@ -1552,7 +1564,7 @@
 58
 00
 01
-dc
+de
 67
 e1
 43
@@ -1560,7 +1572,7 @@
 58
 00
 01
-e8
+ea
 67
 e1
 43
@@ -1576,7 +1588,7 @@
 58
 00
 01
-90
+93
 67
 e1
 43
@@ -1592,7 +1604,7 @@
 58
 00
 01
-a5
+a8
 67
 e1
 43
@@ -1624,7 +1636,7 @@
 20
 40
 01
-95
+98
 20
 40
 70
@@ -1668,7 +1680,7 @@
 20
 22
 81
-a0
+a3
 1f
 e2
 04
@@ -1676,7 +1688,7 @@
 20
 40
 01
-a3
+a6
 1a
 20
 a2
@@ -1684,7 +1696,7 @@
 c2
 00
 01
-9a
+9d
 20
 60
 00
@@ -1700,11 +1712,11 @@
 20
 40
 01
-ae
+b0
 20
 40
 01
-c9
+cb
 20
 40
 68
@@ -1712,10 +1724,6 @@
 20
 40
 67
-6c
-20
-40
-67
 5a
 20
 40
@@ -1736,11 +1744,11 @@
 da
 60
 4f
-c2
+c1
 da
 40
 01
-b1
+b3
 20
 20
 42
@@ -1748,22 +1756,22 @@
 6f
 e0
 cf
-c1
+c0
 c0
 00
 81
-bf
+c1
 c0
 01
 01
-b5
+b7
 20
 60
 00
 00
 70
 4f
-c1
+c0
 02
 20
 40
@@ -1772,22 +1780,22 @@
 24
 3a
 01
-bb
+bd
 70
 4f
-c2
+c1
 02
 da
 60
 4f
-cd
+cc
 20
 20
 63
 71
 70
 4f
-c2
+c1
 02
 70
 49
@@ -1796,14 +1804,14 @@
 da
 60
 4f
-cd
+cc
 20
 20
 63
 71
 70
 4f
-c1
+c0
 01
 20
 40
@@ -1812,22 +1820,22 @@
 24
 3a
 01
-c5
+c7
 70
 4f
-c2
+c1
 02
 da
 60
 4f
-c3
+c2
 20
 20
 63
 71
 70
 4f
-c2
+c1
 02
 70
 49
@@ -1836,7 +1844,7 @@
 da
 60
 4f
-c3
+c2
 20
 20
 63
@@ -1848,7 +1856,7 @@
 da
 40
 01
-cc
+ce
 20
 20
 42
@@ -1860,19 +1868,19 @@
 c0
 00
 81
-d7
+d9
 c0
 01
 01
-d0
+d2
 20
 20
 01
-d9
+db
 20
 40
 01
-d9
+db
 da
 60
 4f
@@ -1884,7 +1892,7 @@
 24
 5a
 01
-d5
+d7
 20
 20
 63
@@ -1900,7 +1908,7 @@
 20
 40
 01
-d9
+db
 20
 20
 67
@@ -1924,7 +1932,7 @@
 c0
 20
 01
-df
+e1
 20
 20
 64
@@ -1952,7 +1960,7 @@
 24
 3a
 01
-f3
+f5
 6f
 e4
 4f
@@ -1972,7 +1980,7 @@
 c0
 12
 01
-eb
+ed
 20
 60
 00
@@ -1996,7 +2004,7 @@
 24
 3a
 01
-f3
+f5
 6f
 e4
 4f
@@ -2028,7 +2036,7 @@
 c2
 84
 81
-fb
+fd
 d8
 a0
 45
@@ -2076,7 +2084,7 @@
 24
 21
 02
-07
+09
 6f
 e0
 c9
@@ -2128,7 +2136,7 @@
 20
 40
 01
-f6
+f8
 d8
 e0
 00
@@ -2164,7 +2172,7 @@
 20
 20
 02
-1a
+1c
 6f
 e1
 48
@@ -2228,7 +2236,7 @@
 20
 40
 02
-37
+39
 6f
 e1
 06
@@ -2276,7 +2284,7 @@
 c2
 00
 02
-23
+25
 20
 60
 00
@@ -2320,7 +2328,7 @@
 20
 20
 02
-41
+43
 1a
 60
 8c
@@ -2332,7 +2340,7 @@
 20
 20
 02
-44
+46
 20
 40
 65
@@ -2356,7 +2364,7 @@
 20
 40
 02
-5f
+57
 18
 e2
 7e
@@ -2364,14 +2372,6 @@
 c0
 01
 82
-58
-c0
-02
-02
-54
-c0
-01
-02
 50
 df
 e0
@@ -2384,38 +2384,6 @@
 6f
 e0
 cf
-c0
-20
-3a
-02
-4e
-da
-60
-4f
-cd
-20
-20
-63
-71
-6f
-e0
-cf
-c0
-20
-3a
-02
-4e
-da
-60
-4f
-c3
-20
-20
-63
-71
-6f
-e0
-cf
 b9
 1f
 e0
@@ -2445,6 +2413,10 @@
 60
 4a
 30
+70
+49
+e5
+28
 20
 40
 67
@@ -2464,15 +2436,7 @@
 70
 49
 e5
-78
-c1
-00
-80
-00
-70
-49
-e5
-e6
+28
 20
 60
 00
@@ -2528,7 +2492,7 @@
 20
 40
 02
-85
+7c
 2a
 2f
 fe
@@ -2560,7 +2524,7 @@
 20
 40
 02
-85
+7c
 d8
 a0
 8a
@@ -2588,7 +2552,7 @@
 20
 21
 02
-7a
+71
 20
 20
 21
@@ -2692,7 +2656,7 @@
 20
 40
 02
-be
+b5
 70
 8a
 08
@@ -2728,7 +2692,7 @@
 20
 40
 02
-b4
+ab
 6f
 f0
 8a
@@ -2772,7 +2736,7 @@
 20
 40
 02
-be
+b5
 70
 80
 cd
@@ -2832,7 +2796,7 @@
 c3
 02
 82
-bf
+b6
 68
 59
 01
@@ -2868,7 +2832,7 @@
 c0
 08
 02
-de
+d5
 58
 00
 57
@@ -2912,7 +2876,7 @@
 c0
 08
 02
-db
+d2
 58
 00
 2b
@@ -2948,7 +2912,7 @@
 20
 20
 02
-d7
+ce
 58
 00
 83
@@ -2960,7 +2924,7 @@
 20
 20
 02
-cc
+c3
 6f
 e0
 c3
@@ -3008,7 +2972,7 @@
 20
 40
 02
-ee
+e5
 20
 20
 24
@@ -3079,8 +3043,8 @@
 00
 20
 22
-83
-01
+82
+f8
 e7
 e0
 80
@@ -3100,7 +3064,7 @@
 c2
 00
 02
-fb
+f2
 1a
 42
 04
@@ -3109,8 +3073,8 @@
 60
 00
 00
-47
-d5
+84
+0c
 aa
 55
 40
@@ -3214,12 +3178,12 @@
 6b
 42
 06
-53
-65
-6c
-66
-69
-65
+42
+4c
+45
+2d
+4d
+33
 aa
 55
 08
@@ -3314,8 +3278,8 @@
 00
 ce
 46
-01
-06
+00
+ff
 aa
 55
 08
@@ -3332,33 +3296,30 @@
 0b
 aa
 55
-08
+07
 00
 e3
 4e
+06
 07
-07
-08
 12
-01
 13
-14
 06
+08
+14
 aa
 55
-0a
+08
 00
 c3
 4a
-60
-00
-41
-00
-50
+28
 00
-44
+09
 00
+18
 00
+0c
 00
 aa
 55
@@ -3405,16 +3366,18 @@
 00
 aa
 55
-06
+08
 00
 57
 4b
-1c
-19
-18
-17
-16
-15
+01
+03
+04
+05
+06
+07
+08
+0a
 aa
 55
 01
@@ -3424,11 +3387,12 @@
 00
 aa
 55
-01
+02
 00
 25
 4b
-00
+14
+14
 aa
 55
 03
@@ -3440,6 +3404,15 @@
 00
 aa
 55
+03
+00
+c3
+4b
+29
+2a
+00
+aa
+55
 06
 00
 97
@@ -3447,8 +3420,8 @@
 13
 14
 14
-13
 14
+13
 14
 aa
 55
@@ -3525,15 +3498,18 @@
 00
 aa
 55
-05
+08
 00
 a2
 4b
-15
-16
-17
-18
-1c
+0a
+08
+07
+06
+05
+04
+03
+01
 aa
 55
 01
@@ -3568,16 +3544,18 @@
 00
 aa
 55
-06
+08
 00
 30
 4a
-1c
-19
-18
-17
-16
-15
+01
+03
+04
+05
+06
+07
+08
+0a
 aa
 55
 01
@@ -3720,15 +3698,18 @@
 00
 aa
 55
-05
+08
 00
 7b
 4a
-15
-16
-17
-18
-1c
+0a
+08
+07
+06
+05
+04
+03
+01
 aa
 55
 01
@@ -3752,7 +3733,7 @@
 55
 08
 00
-c3
+c2
 4f
 01
 03
@@ -3766,7 +3747,7 @@
 55
 08
 00
-cd
+cc
 4f
 0a
 08
@@ -3829,7 +3810,7 @@
 01
 aa
 55
-08
+22
 02
 02
 4c
@@ -4353,6 +4334,32 @@
 08
 70
 0d
+10
+23
+00
+83
+f4
+0e
+d0
+01
+04
+f4
+07
+30
+07
+10
+23
+00
+00
+f4
+0e
+d0
+01
+04
+f4
+07
+30
+07
 aa
 55
 03
@@ -4368,9 +4375,9 @@
 00
 02
 4f
-13
+09
 00
-16
+09
 00
 10
 00
@@ -4382,9 +4389,9 @@
 00
 b0
 4f
-18
+09
 00
-1c
+09
 00
 10
 00
@@ -5131,7 +5138,7 @@
 00
 1c
 41
-2f
+3e
 aa
 55
 0c
@@ -5275,7 +5282,7 @@
 aa
 aa
 55
-99
-9e
-54
-29
+f9
+a5
+fa
+de
Index: output/ramcode.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/output/ramcode.rom	(revision 3203)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/output/ramcode.rom	(working copy)
@@ -1,28 +1,28 @@
 c2840014
 c000001b
-c00100cc
-c00880d5
-c00a02c5
-c00a8161
-c00c016f
-c00c812e
-c00d00e7
-c01282e7
+c00100cf
+c00880d8
+c00a02bc
+c00a8164
+c00c0172
+c00c8131
+c00d00ea
+c01282de
 c0138046
-c051806a
-c05280b3
+c0518065
+c05280b6
 c0530051
-c05500a2
-c0588179
-c0628176
-c06d0296
-c06e02a6
+c05500a5
+c058817c
+c0628179
+c06d028d
+c06e029d
 2020235a
 c012001f
-c012808b
-c0130090
-c01c82e1
-c02682e5
+c012808e
+c0130093
+c01c82d8
+c02682dc
 c17f8000
 2020235a
 2435a002
@@ -81,29 +81,24 @@
 2020247d
 20200052
 18e27e00
-c000e777
-c002e765
-c0006761
-c0018066
-c002005a
-c0010060
+c0016765
+c0026761
+c000005d
+c0028061
+c0008059
 20600000
-6fe0cfc0
+20406730
 207a0000
-704fc101
-704fc202
-da604fc3
+da604bc3
 20206371
-6fe0cfc0
-207a0000
+704fc001
 704fc102
-704fc202
-da604fcd
+da604fc2
+20206371
+704fc002
+704fc102
+da604fcc
 20206371
-6fe0cfc0
-79407e00
-67e0cfc0
-20600000
 6fe0cf9f
 243a6502
 704c0001
@@ -114,24 +109,32 @@
 18e27e00
 6848cec5
 98467c00
-24428081
+24428084
 6fe0cec9
-245a007c
+245a007f
 18e27e00
 67e0cec5
 1fe67e06
 207a0000
-2020651c
+20400079
+dfe0000a
+2020655a
+da604f14
+20406730
+207a0000
+7049e50a
+da604b1b
+20600000
 18e27e00
-c003007f
+c0030082
 20600000
 704ec900
 20204325
 6fe0cec9
-203a0084
+203a0087
 20206529
 20406730
-203a0087
+203a008a
 202064c5
 18e27e00
 2fe00e01
@@ -164,13 +167,13 @@
 efe18006
 67e1c397
 c003e704
-c00080a8
+c00080ab
 202066db
 18c08dfe
 efe08006
-c00300ac
+c00300af
 20600000
-204000ae
+204000b1
 202067bf
 704eaa01
 7049e400
@@ -191,16 +194,16 @@
 24417806
 1a608c09
 efe08006
-243a00c3
+243a00c6
 20206547
 704ec001
 2040656b
-204000c9
+204000cc
 da604aae
 dfe00003
 2020655a
+704fc000
 704fc100
-704fc200
 20206769
 20407552
 20407448
@@ -210,7 +213,7 @@
 20402018
 2040310f
 2040248c
-202000cc
+202000cf
 708a0f60
 708a10aa
 708a127a
@@ -239,14 +242,14 @@
 708a844a
 708a8540
 708a16fe
-20400136
+20400139
 6fe0c436
 205a70d7
-245580e3
+245580e6
 37d98200
 70813b5f
 6fe0c099
-c0080123
+c0080126
 6fe0c438
 1fe1fe04
 67f08a02
@@ -257,18 +260,18 @@
 67f18a73
 708a8660
 708a8b3b
-20400115
+20400118
 70804300
 70804205
 58557474
 67f18968
 7089606e
-20400268
-20400293
-2040010f
+2040025f
+2040028a
+20400112
 7041480c
 20406f4e
-20200295
+2020028c
 20758000
 37d98200
 6fe0c11c
@@ -276,7 +279,7 @@
 37d98200
 20600000
 6fe0c099
-c00c011b
+c00c011e
 6fe0c438
 1fe1fe06
 67f08a02
@@ -299,16 +302,16 @@
 67f18a73
 708a762a
 70890204
-20200101
+20200104
 6fe0c141
-c0050131
+c0050134
 2020220e
 708a1425
 58a93f3f
 67f18a60
 708a631f
 20600000
-2035815d
+20358160
 6fe2020d
 207a0000
 37d98200
@@ -350,7 +353,7 @@
 6fe1415b
 207a0000
 67e1020f
-20200147
+2020014a
 2040686f
 204021ba
 18002a08
@@ -380,19 +383,19 @@
 20406454
 20406459
 7040a60a
-58000210
+58000212
 67e143db
-580001dc
+580001de
 67e143dd
-580001e8
+580001ea
 67e143df
 580062d3
 67e143d3
-58000190
+58000193
 67e143d5
 58006329
 67e143d7
-580001a5
+580001a8
 67e143e3
 58006505
 67e14524
@@ -400,7 +403,7 @@
 2020647d
 20406f35
 7044ecff
-20400195
+20400198
 2040701b
 2020739a
 6fe0c6ce
@@ -411,89 +414,88 @@
 efe08011
 6848c6cf
 98467c00
-202281a0
+202281a3
 1fe20400
-204001a3
+204001a6
 1a20a201
-c200019a
+c200019d
 20600000
 79200407
 20206edd
-204001ae
-204001c9
+204001b0
+204001cb
 20406858
-2040676c
 2040675a
 204064bc
 204064d3
 20406311
 202064d9
-da604fc2
-da4001b1
+da604fc1
+da4001b3
 202042e0
-6fe0cfc1
-c00081bf
-c00101b5
+6fe0cfc0
+c00081c1
+c00101b7
 20600000
-704fc102
+704fc002
 20406730
-243a01bb
-704fc202
-da604fcd
+243a01bd
+704fc102
+da604fcc
 20206371
-704fc202
+704fc102
 7049e51e
-da604fcd
+da604fcc
 20206371
-704fc101
+704fc001
 20406730
-243a01c5
-704fc202
-da604fc3
+243a01c7
+704fc102
+da604fc2
 20206371
-704fc202
+704fc102
 7049e51e
-da604fc3
+da604fc2
 20206371
 da604fb8
-da4001cc
+da4001ce
 202042e0
 6fe0cfb9
-c00081d7
-c00101d0
-202001d9
-204001d9
+c00081d9
+c00101d2
+202001db
+204001db
 da604fba
 20406730
-245a01d5
+245a01d7
 20206371
 da604fbd
 20600000
-204001d9
+204001db
 20206740
 704fb900
 704fb800
 20600000
 1a627e00
-c02001df
+c02001e1
 202064e0
 6fe1433c
 c1000000
 6fe4450a
 207a0000
 20406730
-243a01f3
+243a01f5
 6fe44f02
 67e442d3
 20202e93
 6fe14398
-c01201eb
+c01201ed
 20600000
 204078ad
 7044f101
 20406730
 2040432b
-243a01f3
+243a01f5
 6fe44f02
 67e442d3
 20202e93
@@ -501,7 +503,7 @@
 67e442d3
 20202e93
 6fe144e9
-c28481fb
+c28481fd
 d8a045da
 df200023
 20207ca1
@@ -513,7 +515,7 @@
 1c427e00
 98460400
 20628000
-24210207
+24210209
 6fe0c9e5
 98467c00
 20610000
@@ -526,7 +528,7 @@
 d8404c02
 98408c00
 202063cb
-204001f6
+204001f8
 d8e00009
 20407cef
 247a0000
@@ -535,7 +537,7 @@
 20407ce1
 78547c00
 2040701b
-2020021a
+2020021c
 6fe148ac
 67e1442e
 204065be
@@ -551,7 +553,7 @@
 67e1068c
 18e27e00
 67e1067a
-20400237
+20400239
 6fe1068c
 1fe22600
 6fe1067a
@@ -563,7 +565,7 @@
 1fe0a60a
 6fe10678
 1fe27200
-c2000223
+c2000225
 20600000
 1a60a405
 efe20012
@@ -574,30 +576,20 @@
 24417806
 580003e8
 98467c00
-20200241
+20200243
 1a608c04
 efe08006
-20200244
+20200246
 2040656b
 6fe0cec9
 243a655d
 20406561
 20216500
-2040025f
+20400257
 18e27e00
-c0018258
-c0020254
-c0010250
+c0018250
 dfe0000f
 2020655a
-6fe0cfc0
-203a024e
-da604fcd
-20206371
-6fe0cfc0
-203a024e
-da604fc3
-20206371
 6fe0cfb9
 1fe0fe01
 67e0cfb9
@@ -606,13 +598,12 @@
 704fb804
 20600000
 da604a30
+7049e528
 20406730
 207a0000
 da604b57
 18e27e00
-7049e578
-c1008000
-7049e5e6
+7049e528
 20600000
 20758000
 20402160
@@ -626,7 +617,7 @@
 708ac200
 708ac300
 d8e00006
-20400285
+2040027c
 2a2ffe0d
 2040211d
 2a4ffe0d
@@ -634,14 +625,14 @@
 d8e00005
 2040211c
 2040211e
-20400285
+2040027c
 d8a08ac2
 1a31fe00
 20402117
 1a51fe00
 20402117
 18e08fff
-2021027a
+20210271
 2020214f
 2000003c
 58000f00
@@ -667,7 +658,7 @@
 6fe0c409
 67f080cd
 20000bb8
-204002be
+204002b5
 708a08c1
 6a40c419
 df200008
@@ -676,7 +667,7 @@
 67e0c433
 6240c419
 20600000
-204002b4
+204002ab
 6ff08a09
 793ffe07
 67f08a09
@@ -687,7 +678,7 @@
 6fe0c409
 67f080cd
 20000bb8
-204002be
+204002b5
 7080cd00
 20206fa1
 6ff080cc
@@ -702,7 +693,7 @@
 20600000
 7080cc03
 6ff08129
-c30282bf
+c30282b6
 68590164
 6049440a
 7080cc00
@@ -711,7 +702,7 @@
 708a8d12
 708a8e0a
 6fe0c099
-c00802de
+c00802d5
 58005762
 67f10907
 70890103
@@ -722,7 +713,7 @@
 708a8d44
 708a8e0a
 6fe0c099
-c00802db
+c00802d2
 58002bb1
 67f10907
 c6978000
@@ -731,10 +722,10 @@
 20600000
 58004189
 67f10907
-202002d7
+202002ce
 58008312
 67f10907
-202002cc
+202002c3
 6fe0c334
 c1000000
 c001b04a
@@ -746,7 +737,7 @@
 6fe240ad
 9840fe00
 67e240ad
-204002ee
+204002e5
 20202425
 600440e7
 d8c08070
@@ -764,11 +755,11 @@
 efe08011
 e8408013
 98467c00
-20228301
+202282f8
 e7e08013
 37d98200
 1a20a201
 1a60a601
-c20002fb
+c20002f2
 1a420400
 20600000
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/output/sched.rom	(revision 3203)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/output/sched.rom	(working copy)
@@ -72,7 +72,8 @@
 
 mem_le_lap:09 21 20 98 07 2a
 mem_le_name_len:
-'Selfie
+#'Selfie
+'BLE-M3
 
 mem_tx_power:06
 
@@ -116,11 +117,11 @@
 20 03
 
 #hard_soft_switch config
-mem_shutter_hard_soft_switch_case_temp:01
-mem_shutter_soft_switch_button_gpio_temp:06
+mem_shutter_hard_soft_switch_case_temp:00
+mem_shutter_soft_switch_button_gpio_temp:ff
 #mem_shutter_soft_switch_button_gpio_temp:12
 
-#100ms timer 
+#100ms timer
 mem_shutter_ble_discovery_time_conf:
 b8 0b #discovery_timeout
 70 17 #connect_timeout
@@ -129,7 +130,7 @@
 
 
 #key config
-mem_shutter_key_num_conf:07
+mem_shutter_key_num_conf:06
 mem_shutter_dy_key_conf:
 #test 6key
 #06   #right
@@ -148,23 +149,21 @@
 # 07   #left
 # 0d   #move
 
-#jxy-290-JM65
-07   #right
-08   #like
-12   #down
-01   #photo
-13   #up
-14   #left
-06   #move
-
+#jxy-181
+07	#right
+12 	#like
+13 	#down
+06 	#photo
+08 	#up
+14 	#left
 
 
 mem_combine_key0:
 #6key
-#28 00 #left 2
-#09 00 #right 2
-#18 00 #up 2
-#0c 00 #down 2
+28 00 #left 2
+09 00 #right 2
+18 00 #up 2
+0c 00 #down 2
 
 #6key -key mirror
 #09 00 #left 2
@@ -173,11 +172,11 @@
 #18 00 #down 2
 
 #7key
-60 00 #left 2
-41 00 #right 2
-50 00 #up 2
-44 00 #down 2
-00 00
+# 60 00 #left 2
+# 41 00 #right 2
+# 50 00 #up 2
+# 44 00 #down 2
+# 00 00
 
 #7key -key mirror
 #41 00 #left 2
@@ -202,17 +201,19 @@
 mem_key0_press_i:  #right
 00
 mem_key0_release_new_i:
-1c 19 18 17 16 15
+01 03 04 05 06 07 08 0a
 mem_key0_long_press_i:
 00
 
 mem_key1_press_i:#like
-00
+14 14
 mem_key1_release_new_i:
 13 14 00
+mem_key1_long_press_i:
+29 2a 00
 
 mem_shutter_link_data_i:
-13 14 14 13 14 14
+13 14 14 14 13 14
 
 mem_key2_press_i:#down
 00
@@ -235,7 +236,7 @@
 mem_key5_press_i:#left
 00
 mem_key5_release_new_i:
-15 16 17 18 1c
+0a 08 07 06 05 04 03 01
 mem_key5_long_press_i:
 00
 
@@ -250,8 +251,8 @@
 mem_dy_key0_press:  #right
 00
 mem_key0_release_new:
-1c 19 18 17 16 15
-mem_key0_long_press: 
+01 03 04 05 06 07 08 0a
+mem_key0_long_press:
 00
 
 mem_dy_key1_press:#like
@@ -291,7 +292,7 @@
 mem_dy_key5_press:#left
 00
 mem_key5_release_new:
-15 16 17 18 1c
+0a 08 07 06 05 04 03 01
 mem_key5_long_press:
 00
 
@@ -309,7 +310,7 @@
 mem_combine_key1_press:
 02
 mem_combine_key2_press:
-03 
+03
 mem_combine_key3_press:
 04
 mem_combine_key_release:
@@ -347,7 +348,7 @@
 02 1b 00 01 00 00 00 00 00 00 00 00 00 #12 android Mode Step
 #like
 10 23 00 83 f4 07 30 07 04 f4 07 30 07 #13
-10 23 00 00 f4 07 30 07 04 f4 07 30 07 #14	
+10 23 00 00 f4 07 30 07 04 f4 07 30 07 #14
 #right and left
 10 23 00 00 40 02 40 08 04 40 02 40 08 #15
 10 23 00 83 80 03 40 08 04 80 03 40 08 #16
@@ -373,8 +374,11 @@
 10 23 00 83 00 08 70 0d 04 00 08 70 0d #27
 10 23 00 00 00 08 70 0d 04 00 08 70 0d #28
 
+10 23 00 83 f4 0e d0 01 04 f4 07 30 07 #29
+10 23 00 00 f4 0e d0 01 04 f4 07 30 07 #2a
+
 mem_shutter_move_data:
-00 00 00  #defualt 
+00 00 00  #defualt
 
 #mem_le_dy_adv_data:
 #02 01 05
@@ -384,54 +388,55 @@
 #0d 09 56 30 2d 53 68 75 74 74 65 72
 
 mem_ble_shutter_dy_interval_min_new:
-13 00
-16 00
+09 00
+09 00
 10 00
 2c 01
 
 mem_ble_shutter_dy_interval_min_ios:
-18 00
-1c 00
+09 00
+09 00
 10 00
 2c 01
 
+
 #attribute list: handle 2bytes, uuid 2bytes, length 1bytes, attribute Nbytes
 mem_shutter_le_uuid_sup:
 #Primary service GATT ------
-01 00 02 00 28 02 01 18 
+01 00 02 00 28 02 01 18
 #Service changed
-02 00 02 03 28 01 20 
+02 00 02 03 28 01 20
 03 00 02 05 2a 01 00
 #Client Characteristic Configuration
-04 00 02 02 29 02 00 00 
+04 00 02 02 29 02 00 00
 
 #Primary service GAP ------
 05 00 02 00 28 02 00 18
 
 #Device name
-06 00 02 03 28 01 02 
+06 00 02 03 28 01 02
 07 00 02 00 2a 13 43 68 69 70 73 65 61 2d 42 4c 45 20 20 20 20 20 20 20 20
 
 #Appearance
-08 00 02 03 28 01 02 
-09 00 02 01 2a 02 c1 03 
+08 00 02 03 28 01 02
+09 00 02 01 2a 02 c1 03
 
 #Peripheral Preferred Connection Parameters
-0a 00 02 03 28 01 02 
+0a 00 02 03 28 01 02
 0b 00 02 04 2a 08 06 00 06 00 64 00 2c 01 # interval 6ms, latency 100, timeout 300
 
 #Primary service device information ------
-0c 00 02 00 28 02 0a 18 
+0c 00 02 00 28 02 0a 18
 #PNP id
-0d 00 02 03 28 01 02 
+0d 00 02 03 28 01 02
 0e 00 02 50 2a 07 01 05 0e 00 0a 02 40
 
 #Primary service hid ------
-0f 00 02 00 28 02 12 18 
+0f 00 02 00 28 02 12 18
 
 #Protocol mode
-10 00 02 03 28 01 06 
-11 00 02 4e 2a 01 01 
+10 00 02 03 28 01 06
+11 00 02 4e 2a 01 01
 
 
 #Hid report
@@ -443,18 +448,18 @@
 15 00 02 08 29 02 01 01 # report id=1, type=1 input
 
 #Hid report id 4
-16 00 02 03 28 01 10 
+16 00 02 03 28 01 10
 17 00 02 4d 2a 03 00 00 00
 #Client Characteristic
-18 00 02 02 29 02 00 00 
+18 00 02 02 29 02 00 00
 #Report reference
 19 00 02 08 29 02 04 01 # report id=4, type=1 input
 
 #Hid report id 3
 1a 00 02 03 28 01 10
-1b 00 02 4d 2a 02 00 00 
+1b 00 02 4d 2a 02 00 00
 #Client Characteristic
-1c 00 02 02 29 02 00 00 
+1c 00 02 02 29 02 00 00
 #Report reference
 1d 00 02 08 29 02 03 01 # report id=3, type=1 input
 
@@ -462,7 +467,7 @@
 1e 00 02 03 28 01 10
 1f 00 02 4d 2a 03 00 00 00
 #Client Characteristic
-20 00 02 02 29 02 00 00 
+20 00 02 02 29 02 00 00
 #Report reference
 21 00 02 08 29 02 05 01 # report id=5, type=1 input
 
@@ -484,16 +489,16 @@
 29 00 02 08 29 02 02 01 # report id=2, type=1 input
 
 #Report map
-2a 00 02 03 28 01 02 
+2a 00 02 03 28 01 02
 2b 00 02 4b 2a 01 00
 
 #Hid information
 2c 00 02 03 28 01 02
-2d 00 02 4a 2a 04 11 01 00 01 
+2d 00 02 4a 2a 04 11 01 00 01
 
 #Hid control point
-2e 00 02 03 28 01 04 
-2f 00 02 4c 2a 01 00 
+2e 00 02 03 28 01 04
+2f 00 02 4c 2a 01 00
 30 00 02 00 28 02 0f 18
 
 00 00
@@ -637,7 +642,7 @@
 mem_lpm_hv_sel:b4
 
 mem_fcomp_div:18
-mem_xtal_c_sel:2f
+mem_xtal_c_sel:3e
 mem_gpio_wakeup_cfg:00 00 20 00 00 00 00 00 00 00 00 00
 
 mem_version:08 0e 05 03 00
Index: program/patch.prog
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/program/patch.prog	(revision 3203)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/program/patch.prog	(working copy)
@@ -9,7 +9,7 @@
 	beq patch02_5,p_rf_rx_enable
 	beq patch03_0,p_txon
 	beq patch03_1,p_set_tx_power
-	beq patch03_2,p_initialize_radio_cont	
+	beq patch03_2,p_initialize_radio_cont
 	beq patch04_5,p_lpm_sleep
 	beq patch04_7,p_lpm_adjust_clk
 	beq patch14_3,p_shutter_dy_key_press
@@ -110,40 +110,36 @@
 
 p_shutter_dy_long_key_function:
 	copy queue,pdata
-	beq SHUTTER_LIKE_KEY_NUM,shutter_dy_link_key_long_press
-	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_PHOTO_KEY_NUM,p_shutter_dy_change_mode
-	beq SHUTTER_UP_KEY_NUM,p_shutter_dy_loop_send_fouse_up
-	beq SHUTTER_DOWN_KEY_NUM,p_shutter_dy_loop_send_fouse_down
+	// beq SHUTTER_LIKE_KEY_NUM,shutter_dy_link_key_long_press
+	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_RIGHT_KEY_NUM,p_shutter_dy_loop_send_fouse_up
+	beq SHUTTER_LEFT_KEY_NUM,p_shutter_dy_loop_send_fouse_down
+	beq SHUTTER_LIKE_KEY_NUM,p_shutter_dy_ios_dy_mode_step
 	rtn
 
-p_shutter_dy_loop_send_fouse_up:
-	fetch 1,mem_shutter_dy_photo_mode_flag
+p_shutter_dy_ios_dy_mode_step:
+	call shutter_dy_check_iphone
 	rtn blank
+	arg mem_key1_long_press_i,regc
+	branch push_buffer_in_queue
+
+p_shutter_dy_loop_send_fouse_up:
 	jam MEM_FOUSEUP,mem_shutter_loop_send_fouse
 	jam 2,mem_shutter_zoomup_time
 	arg mem_shutter_dy_fouse_up,regc
 	branch push_buffer_in_queue
 
 p_shutter_dy_loop_send_fouse_down:
-	fetch 1,mem_shutter_dy_photo_mode_flag
-	rtn blank
 	jam MEM_FOUSEDOWN,mem_shutter_loop_send_fouse
 	jam 2,mem_shutter_zoomup_time
 	arg mem_shutter_dy_fouse_down,regc
 	branch push_buffer_in_queue
 
-p_shutter_dy_change_mode:
-	fetch 1,mem_shutter_dy_photo_mode_flag
-	setflip 0,pdata
-	store 1,mem_shutter_dy_photo_mode_flag
-	rtn
-
 p_shutter_dy_key_press:
 	fetch 1,mem_shutter_link_loop_flag
 	nbranch shutter_dy_key_value_filter,blank
-p_shutter_dy_key_press_next:	
+p_shutter_dy_key_press_next:
 	jam 1,mem_shutter_key_pressed
 	call app_led_on
 	call shutter_dy_key_press_clk
@@ -159,8 +155,18 @@
 	store 1,mem_last_press_key_value
 	sub pdata,6,pdata
 	rtn blank
-	branch shutter_dy_page_set
-	
+	call p_shutter_dy_le_get_press_ptr
+	arg MAX_QUEUE_NEW_PRESS,pdata
+	branch shutter_dy_push_queue_press_or_release
+
+p_shutter_dy_le_get_press_ptr:
+	arg mem_dy_key0_press,regc
+	call shutter_dy_check_iphone
+	rtn blank
+	jam 10,mem_send_data_delay
+	arg mem_key0_press_i,regc
+	rtn
+
 
 p_shutter_short_key_cancel:
 	copy queue,pdata
@@ -169,7 +175,7 @@
 
 p_move_mode_disable:
 	jam 0,mem_move_mode_trigger_enable
-	branch app_led_off	
+	branch app_led_off
 
 p_shutter_dy_iphone_check_move_mid:
 	fetch 1,mem_move_mode_trigger_enable
@@ -188,14 +194,14 @@
 	branch shutter_dy_android_like_loaction_mid
 
 p_le_rx_dec:
-	call le_check_retransmit	
+	call le_check_retransmit
 	fetchr rega, 1,mem_le_rxbuf_data_length
 	increase -4,rega
 	nbranch le_crc_fail_consecutive,positive
 	branch le_rx_dec+6
 
 p_le_rx_nopayload:
-	parse demod,bucket,24	
+	parse demod,bucket,24
 	rshift32 pdata,pdata
 	rshift16 pdata,pdata
 	istore 3,contw
@@ -227,11 +233,11 @@
 	increase -2,contr
 	ifetch 1,contr
 	beq ATTOP_FIND_BY_TYPE_VALUE_REQUEST,p_shutter_dy_not_iphone_read_conf
-	rtn	
+	rtn
 
 p_shutter_dy_not_iphone_read_conf:
 	call p_shutter_dy_remote_not_iphone
-	branch shutter_dy_load_move_config_info	
+	branch shutter_dy_load_move_config_info
 
 p_shutter_dy_remote_not_iphone:
 	jam 1,mem_shutter_back_count
@@ -239,7 +245,7 @@
 	jam 0,mem_last_shutter_le_iphone_flag
 	jam 10,mem_send_data_delay
 	rtn
-	
+
 p_shutter_dy_shutter_key_release:
 	fetch 1,mem_move_mode_trigger_enable
 	call shutter_dy_key_release_led,blank
@@ -287,19 +293,19 @@
 
 
 p_set_sync_on:
-	jam 0x60,0x8a0f 
-	jam 0xaa,0x8a10 
-	jam 0x7a,0x8a12 
-	jam 0x00,0x8a25 
-	jam 0x00,0x8a26 
+	jam 0x60,0x8a0f
+	jam 0xaa,0x8a10
+	jam 0x7a,0x8a12
+	jam 0x00,0x8a25
+	jam 0x00,0x8a26
 	nop 60
-	jam 0x20,0x8a20 
-	jam 0xf5,0x8a23 
-	jam 0x12,0x8a24 
-	jam 0x10,0x8a24 
+	jam 0x20,0x8a20
+	jam 0xf5,0x8a23
+	jam 0x12,0x8a24
+	jam 0x10,0x8a24
 	nop 60
-	jam 0x60,0x8a12 
-	jam 0xdd,0x8a23 
+	jam 0x60,0x8a12
+	jam 0xdd,0x8a23
 	rtn
 
 p_set_ck2rfpll:
@@ -312,11 +318,11 @@
 	jam 0,mem_le_testtype
 	jam 0,mem_cmd_le_create_conn
 	until null,lpo_edge
-	
+
 	jam 0x0d,0x8946
 	jam 0x10,0x896f
 
-	jam 0xcd,0x8a13	
+	jam 0xcd,0x8a13
 	jam 0x10,0x8a06
 	jam 0x4a,0x8a84
 	jam 0x40,0x8a85
@@ -327,7 +333,7 @@
 	call wdt_set_disable,blank
 	ncall p_set_ck2rfpll,wake
 	until null,lpo_edge
-	jam 0x5f,0x813b 
+	jam 0x5f,0x813b
 	fetch 1,mem_fcomp_div
 	beq XTAL_16M,p_initialize_radio_16m
 	fetch 1,mem_ring_ibias_trim
@@ -337,10 +343,10 @@
 	jam 0x24,0x8a80
 	jam 0x62,0x8a81
 	setarg 0xe61212
-	store 3,0x8a73	
+	store 3,0x8a73
 p_initialize_radio2:
 	jam 0x60,0x8a86
-	jam 0x3b,0x8a8b 
+	jam 0x3b,0x8a8b
 	call p_dpll_on
 	jam 0,core_config
 	jam CLKSEL_DPLL,core_clksel
@@ -353,7 +359,7 @@
 	jam SYSTEM_CLK_12M,mem_system_clk
 	call sadc_calibration
 	branch p_dpll_ring_ibias_calc
-	
+
 p_set_xtal_cap:
 	rtn wake
 	until null,lpo_edge
@@ -361,7 +367,7 @@
 	store 1,core_xtal_cap
 	until null,lpo_edge
 	rtn
-	
+
 p_dpll_on:
 	fetch 1,mem_fcomp_div
 	beq XTAL_24M,p_dpll_on_24m
@@ -369,7 +375,7 @@
 	or_into 0x06,pdata
 	store 1,0x8a02
 	jam 0xe0,0x8a05
-p_dpll_on_24m:	
+p_dpll_on_24m:
 	jam 0xd8,0x8a00
 	nop 60
 	jam 0xa0,0x8a01
@@ -378,7 +384,7 @@
 	nop 20
 	jam 0x9f,0x8a00
 	rtn
-	
+
 p_initialize_radio_16m:
 	fetch 1,mem_ring_ibias_trim
 	or_into 0x06,pdata
@@ -389,19 +395,19 @@
 	setarg 0xe40909
 	store 3,0x8a73
 	jam 0x2a,0x8a76
-	jam 0x04,0x8902	
-	branch p_initialize_radio2	
+	jam 0x04,0x8902
+	branch p_initialize_radio2
 
-p_set_tx_power:	
+p_set_tx_power:
 	fetch 1,mem_tx_power
 	beq TX_POWER_10DB,p_set_tx_power_10db
 	branch set_tx_power+2
-	
+
 p_set_tx_power_10db:
-	jam 0x25,0x8a14 
+	jam 0x25,0x8a14
 	setarg 0xa93f3f
 	store 3,0x8a60
-	jam 0x1f,0x8a63 
+	jam 0x1f,0x8a63
 	rtn
 
 p_set_otp_config:
@@ -413,7 +419,7 @@
 	and pdata,0xf0,pdata
 	fetcht 1,mem_otp_core_ldo
 	ior temp,pdata
-	store 1,0x8136 
+	store 1,0x8136
 	until null,lpo_edge
 
 	fetch 1,0x8138
@@ -421,9 +427,9 @@
 	fetcht 1,mem_otp_verf_bg
 	lshift3 temp,temp
 	ior temp,pdata
-	store 1,0x8138 
+	store 1,0x8138
 	until null,lpo_edge
-	
+
 p_set_otp_config2:
 	fetch 1,0x8acb
 	and pdata,0xf0,pdata
@@ -438,7 +444,7 @@
 	fetch 1,0x8a06
 	setflag true,7,pdata
 	store 1,0x8a06
-	
+
 	fetch 1,mem_otp_dpll_ibais
 	and pdata,7,temp
 	lshift4 temp,temp
@@ -449,7 +455,7 @@
 	ior temp,pdata
 	store 1,0x8a02
 	rtn
-	
+
 p_set_otp_config_wake:
 	fetch 2,mem_otp_charge_pump_x
 	rtn blank
@@ -473,15 +479,15 @@
 	jam 0x30,0x8a26
 	jam 0xfe,0x8a16
 	branch rf_rx_enable+14
-	
+
 p_txon:
 //	bpatch patch03_0,mem_patch03
 	setarg 0x0aaa7e
 	store 3,0x8a0f
 	nop 60
-	jam 0x00,0x8a25 
-	jam 0x0d,0x8a26 
-	jam 0xf6,0x8a16 
+	jam 0x00,0x8a25
+	jam 0x0d,0x8a26
+	jam 0xf6,0x8a16
 	branch txon+7
 
 p_otp_read_data:
@@ -498,7 +504,7 @@
 
 	setarg p_shutter_dy_process_idle
 	store 2,mem_cb_idle_process
-		
+
 	setarg p_shutter_dy_process_bb_event
 	store 2,mem_cb_bb_event_process
 
@@ -515,7 +521,7 @@
 	store 2,mem_cb_before_lpm
 
 	setarg p_shutter_dy_le_bb_event_timer
-	store 2,mem_cb_event_timer	
+	store 2,mem_cb_event_timer
 
 	setarg shutter_dy_key_change
 	store 2,mem_cb_shutter_keycan
@@ -547,22 +553,22 @@
 	increase 1,rega
 	loop p_set_key_gpio_loop
 	rtn
-	
+
 p_shutter_gpio_config_input_pd:
 	set1 gpio_active_bit,temp
-	branch gpio_config_input	
+	branch gpio_config_input
 
 
 p_shutter_dy_le_bb_event_timer:
 	call p_shutter_dy_zoom_timer
 	call p_shutter_dy_photo_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	
+	branch shutter_dy_check_power_off_timer
 
 p_shutter_dy_zoom_timer:
 	arg mem_shutter_zoomup_time,regc
@@ -664,12 +670,12 @@
 	nbranch p_parameter_updata_response_ios,blank
 	fetch 8,mem_ble_shutter_dy_interval_min_new
 	store 8,mem_le_interval_min
-	branch le_l2cap_tx_update_req	
+	branch le_l2cap_tx_update_req
 
 p_parameter_updata_response_ios:
 	fetch 8,mem_ble_shutter_dy_interval_min_ios
 	store 8,mem_le_interval_min
-	branch le_l2cap_tx_update_req	
+	branch le_l2cap_tx_update_req
 
 p_shutter_dy_shutter_send_data_to_master:
 	fetch 2,mem_ui_state_map
@@ -693,7 +699,7 @@
 	rtn positive
 p_shutter_dy_pop_queue_to_ble_data2:
 	copy clkn_bt,pdata
-	store 4,mem_key_send_clk	
+	store 4,mem_key_send_clk
 	call queue_pop_one_byte
 	nrtn user
 	pincrease -1
@@ -712,7 +718,7 @@
 	call timer_init
 	disable user
 	call keyscan_process_lpm_before
-	branch p_shutter_dy_keyscan_key_process	
+	branch p_shutter_dy_keyscan_key_process
 
 p_shutter_dy_keyscan_key_process:
 	fetch 2,mem_key_value_xmem
@@ -720,12 +726,12 @@
 	call shutter_dy_keyscan_key_process_next
 	fetch 2,mem_key_value_retention
 	store 2,mem_key_value_xmem
-	
+
 	arg 0,queue
 	fetch 1,mem_shutter_key_num
 	copy pdata,loopcnt
 	arg mem_shutter_key_state0,regc
-p_shutter_dy_keyscan_key_check_release_loop:	
+p_shutter_dy_keyscan_key_check_release_loop:
 	copy loopcnt,pdata
 	store 2,mem_temp
 	copy regc,pdata
@@ -733,13 +739,13 @@
 	copy queue,pdata
 	store 2,mem_temp+2
 	call p_shutter_dy_keyscan_key_check_release
-	
+
 	fetch 2,mem_regc
 	copy pdata,regc
-	fetch 2,mem_temp+2	
+	fetch 2,mem_temp+2
 	copy pdata,queue
 	call shutter_dy_keyscan_key_check_long_press
-	
+
 	fetch 2,mem_temp+2
 	add pdata,1,queue
 	fetch 2,mem_regc
@@ -759,7 +765,7 @@
 	ncall ui_timer_timeout,positive
 	setarg 1000 //100ms 320
 	isub temp,null
-	branch p_shutter_dy_push_queue_release	
+	branch p_shutter_dy_push_queue_release
 p_shutter_dy_push_queue_release:
 	add regc,4,contr
 	ifetch 1,contr
@@ -774,26 +780,10 @@
 	call p_shutter_dy_le_get_release_ptr
 	copy queue,pdata
 	beq SHUTTER_PHOTO_KEY_NUM,p_shutter_dy_photo_event
-	beq SHUTTER_UP_KEY_NUM,p_shutter_dy_select_mode_up
-	beq SHUTTER_DOWN_KEY_NUM,p_shutter_dy_select_mode_down
 p_shutter_dy_push_queue_release1_next_new:
 	arg MAX_QUEUE_NUM_RELEASE,pdata
 	branch shutter_dy_push_queue_press_or_release
 
-p_shutter_dy_select_mode_down:
-	fetch 1,mem_shutter_dy_photo_mode_flag
-	branch p_shutter_dy_push_queue_release1_next_new,blank
-	arg mem_shutter_dy_fouse_down,regc
-	branch push_buffer_in_queue
-
-
-p_shutter_dy_select_mode_up:
-	fetch 1,mem_shutter_dy_photo_mode_flag
-	branch p_shutter_dy_push_queue_release1_next_new,blank
-	arg mem_shutter_dy_fouse_up,regc
-	branch push_buffer_in_queue
-
-
 p_shutter_dy_photo_event:
 	fetch 1,mem_shutter_dy_photo_count
 	increase 1,pdata
@@ -807,21 +797,20 @@
 p_shutter_dy_le_get_release_ptr:
 p_shutter_dy_le_get_release_ptr_set:
 	arg mem_key0_release_new,regc
+	jam 40,mem_send_data_delay
 	call shutter_dy_check_iphone
 	rtn blank
 	arg mem_key0_release_new_i,regc
 	copy queue,pdata
-	jam 120,mem_send_data_delay
-	rtneq SHUTTER_LIKE_KEY_NUM
-	jam 230,mem_send_data_delay
-	rtn	
+	jam 40,mem_send_data_delay
+	rtn
 
 p_rx_dcoc:
 //	bpatch patch01_7,mem_patch01
 	rtn wake
 	call set_sync_on
 	arg 39,temp
-	call set_freq_rx	
+	call set_freq_rx
 	call rf_rx_enable
 	jam 0x7f,0x8a25
 	jam 0x1a,0x8a30
@@ -857,7 +846,7 @@
 	store 2,0x8984
 	jam 0x9,0x8981
 	jam 0x3,0x8981
-	jam 0x6,0x8980	
+	jam 0x6,0x8980
 	nop 60
 	arg 0,rega
 	arg 0,regb
@@ -868,7 +857,7 @@
 p_rfpll_aac_ghpc:
 	rtn wake
 	branch rfpll_aac_ghpc+1
-	
+
 p_dpll_ring_ibias_calc:
 	rtn
 
@@ -927,7 +916,7 @@
 	storet 2,mem_adc_current_value
 	jam 0x00,core_sadc_ctrl
 	rtn
-	
+
 
 
 p_set_lemode:
@@ -971,9 +960,9 @@
 	rtneq LLID_RESERVED
 	beq LLID_LE_LL,le_parse_ll
 	branch le_parse_l2cap
-	
+
 p_le_init_adv:
-	set0 mark_ble_crc_fail,mark	
+	set0 mark_ble_crc_fail,mark
 	branch le_init_adv+1
 
 p_lpm_sleep:
@@ -1009,7 +998,7 @@
 	branch p_lpm_write_gpio_loop_next,zero
 	istore 1,regc
 	until null,lpo_edge
-p_lpm_write_gpio_loop_next:	
+p_lpm_write_gpio_loop_next:
 	increase 1,rega
 	increase 1,regc
 	loop p_lpm_write_gpio_loop
Index: sched/1305.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/sched/1305.dat	(revision 3203)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/sched/1305.dat	(working copy)
@@ -9,7 +9,7 @@
 mem_lpm_hv_sel:b4
 
 mem_fcomp_div:18
-mem_xtal_c_sel:2f
+mem_xtal_c_sel:3e
 mem_gpio_wakeup_cfg:00 00 20 00 00 00 00 00 00 00 00 00
 
 mem_version:08 0e 05 03 00
Index: sched/shutter_dy.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/sched/shutter_dy.dat	(revision 3203)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_290_JM65/sched/shutter_dy.dat	(working copy)
@@ -5,7 +5,8 @@
 
 mem_le_lap:09 21 20 98 07 2a
 mem_le_name_len:
-'Selfie
+#'Selfie
+'BLE-M3
 
 mem_tx_power:06
 
@@ -49,11 +50,11 @@
 20 03
 
 #hard_soft_switch config
-mem_shutter_hard_soft_switch_case_temp:01
-mem_shutter_soft_switch_button_gpio_temp:06
+mem_shutter_hard_soft_switch_case_temp:00
+mem_shutter_soft_switch_button_gpio_temp:ff
 #mem_shutter_soft_switch_button_gpio_temp:12
 
-#100ms timer 
+#100ms timer
 mem_shutter_ble_discovery_time_conf:
 b8 0b #discovery_timeout
 70 17 #connect_timeout
@@ -62,7 +63,7 @@
 
 
 #key config
-mem_shutter_key_num_conf:07
+mem_shutter_key_num_conf:06
 mem_shutter_dy_key_conf:
 #test 6key
 #06   #right
@@ -81,23 +82,21 @@
 # 07   #left
 # 0d   #move
 
-#jxy-290-JM65
-07   #right
-08   #like
-12   #down
-01   #photo
-13   #up
-14   #left
-06   #move
-
+#jxy-181
+07	#right
+12 	#like
+13 	#down
+06 	#photo
+08 	#up
+14 	#left
 
 
 mem_combine_key0:
 #6key
-#28 00 #left 2
-#09 00 #right 2
-#18 00 #up 2
-#0c 00 #down 2
+28 00 #left 2
+09 00 #right 2
+18 00 #up 2
+0c 00 #down 2
 
 #6key -key mirror
 #09 00 #left 2
@@ -106,11 +105,11 @@
 #18 00 #down 2
 
 #7key
-60 00 #left 2
-41 00 #right 2
-50 00 #up 2
-44 00 #down 2
-00 00
+# 60 00 #left 2
+# 41 00 #right 2
+# 50 00 #up 2
+# 44 00 #down 2
+# 00 00
 
 #7key -key mirror
 #41 00 #left 2
@@ -135,17 +134,19 @@
 mem_key0_press_i:  #right
 00
 mem_key0_release_new_i:
-1c 19 18 17 16 15
+01 03 04 05 06 07 08 0a
 mem_key0_long_press_i:
 00
 
 mem_key1_press_i:#like
-00
+14 14
 mem_key1_release_new_i:
 13 14 00
+mem_key1_long_press_i:
+29 2a 00
 
 mem_shutter_link_data_i:
-13 14 14 13 14 14
+13 14 14 14 13 14
 
 mem_key2_press_i:#down
 00
@@ -168,7 +169,7 @@
 mem_key5_press_i:#left
 00
 mem_key5_release_new_i:
-15 16 17 18 1c
+0a 08 07 06 05 04 03 01
 mem_key5_long_press_i:
 00
 
@@ -183,8 +184,8 @@
 mem_dy_key0_press:  #right
 00
 mem_key0_release_new:
-1c 19 18 17 16 15
-mem_key0_long_press: 
+01 03 04 05 06 07 08 0a
+mem_key0_long_press:
 00
 
 mem_dy_key1_press:#like
@@ -224,7 +225,7 @@
 mem_dy_key5_press:#left
 00
 mem_key5_release_new:
-15 16 17 18 1c
+0a 08 07 06 05 04 03 01
 mem_key5_long_press:
 00
 
@@ -242,7 +243,7 @@
 mem_combine_key1_press:
 02
 mem_combine_key2_press:
-03 
+03
 mem_combine_key3_press:
 04
 mem_combine_key_release:
@@ -280,7 +281,7 @@
 02 1b 00 01 00 00 00 00 00 00 00 00 00 #12 android Mode Step
 #like
 10 23 00 83 f4 07 30 07 04 f4 07 30 07 #13
-10 23 00 00 f4 07 30 07 04 f4 07 30 07 #14	
+10 23 00 00 f4 07 30 07 04 f4 07 30 07 #14
 #right and left
 10 23 00 00 40 02 40 08 04 40 02 40 08 #15
 10 23 00 83 80 03 40 08 04 80 03 40 08 #16
@@ -306,8 +307,11 @@
 10 23 00 83 00 08 70 0d 04 00 08 70 0d #27
 10 23 00 00 00 08 70 0d 04 00 08 70 0d #28
 
+10 23 00 83 f4 0e d0 01 04 f4 07 30 07 #29
+10 23 00 00 f4 0e d0 01 04 f4 07 30 07 #2a
+
 mem_shutter_move_data:
-00 00 00  #defualt 
+00 00 00  #defualt
 
 #mem_le_dy_adv_data:
 #02 01 05
@@ -317,54 +321,55 @@
 #0d 09 56 30 2d 53 68 75 74 74 65 72
 
 mem_ble_shutter_dy_interval_min_new:
-13 00
-16 00
+09 00
+09 00
 10 00
 2c 01
 
 mem_ble_shutter_dy_interval_min_ios:
-18 00
-1c 00
+09 00
+09 00
 10 00
 2c 01
 
+
 #attribute list: handle 2bytes, uuid 2bytes, length 1bytes, attribute Nbytes
 mem_shutter_le_uuid_sup:
 #Primary service GATT ------
-01 00 02 00 28 02 01 18 
+01 00 02 00 28 02 01 18
 #Service changed
-02 00 02 03 28 01 20 
+02 00 02 03 28 01 20
 03 00 02 05 2a 01 00
 #Client Characteristic Configuration
-04 00 02 02 29 02 00 00 
+04 00 02 02 29 02 00 00
 
 #Primary service GAP ------
 05 00 02 00 28 02 00 18
 
 #Device name
-06 00 02 03 28 01 02 
+06 00 02 03 28 01 02
 07 00 02 00 2a 13 43 68 69 70 73 65 61 2d 42 4c 45 20 20 20 20 20 20 20 20
 
 #Appearance
-08 00 02 03 28 01 02 
-09 00 02 01 2a 02 c1 03 
+08 00 02 03 28 01 02
+09 00 02 01 2a 02 c1 03
 
 #Peripheral Preferred Connection Parameters
-0a 00 02 03 28 01 02 
+0a 00 02 03 28 01 02
 0b 00 02 04 2a 08 06 00 06 00 64 00 2c 01 # interval 6ms, latency 100, timeout 300
 
 #Primary service device information ------
-0c 00 02 00 28 02 0a 18 
+0c 00 02 00 28 02 0a 18
 #PNP id
-0d 00 02 03 28 01 02 
+0d 00 02 03 28 01 02
 0e 00 02 50 2a 07 01 05 0e 00 0a 02 40
 
 #Primary service hid ------
-0f 00 02 00 28 02 12 18 
+0f 00 02 00 28 02 12 18
 
 #Protocol mode
-10 00 02 03 28 01 06 
-11 00 02 4e 2a 01 01 
+10 00 02 03 28 01 06
+11 00 02 4e 2a 01 01
 
 
 #Hid report
@@ -376,18 +381,18 @@
 15 00 02 08 29 02 01 01 # report id=1, type=1 input
 
 #Hid report id 4
-16 00 02 03 28 01 10 
+16 00 02 03 28 01 10
 17 00 02 4d 2a 03 00 00 00
 #Client Characteristic
-18 00 02 02 29 02 00 00 
+18 00 02 02 29 02 00 00
 #Report reference
 19 00 02 08 29 02 04 01 # report id=4, type=1 input
 
 #Hid report id 3
 1a 00 02 03 28 01 10
-1b 00 02 4d 2a 02 00 00 
+1b 00 02 4d 2a 02 00 00
 #Client Characteristic
-1c 00 02 02 29 02 00 00 
+1c 00 02 02 29 02 00 00
 #Report reference
 1d 00 02 08 29 02 03 01 # report id=3, type=1 input
 
@@ -395,7 +400,7 @@
 1e 00 02 03 28 01 10
 1f 00 02 4d 2a 03 00 00 00
 #Client Characteristic
-20 00 02 02 29 02 00 00 
+20 00 02 02 29 02 00 00
 #Report reference
 21 00 02 08 29 02 05 01 # report id=5, type=1 input
 
@@ -417,16 +422,16 @@
 29 00 02 08 29 02 02 01 # report id=2, type=1 input
 
 #Report map
-2a 00 02 03 28 01 02 
+2a 00 02 03 28 01 02
 2b 00 02 4b 2a 01 00
 
 #Hid information
 2c 00 02 03 28 01 02
-2d 00 02 4a 2a 04 11 01 00 01 
+2d 00 02 4a 2a 04 11 01 00 01
 
 #Hid control point
-2e 00 02 03 28 01 04 
-2f 00 02 4c 2a 01 00 
+2e 00 02 03 28 01 04
+2f 00 02 4c 2a 01 00
 30 00 02 00 28 02 0f 18
 
 00 00