Index: format/app_shutter_dy.format
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/format/app_shutter_dy.format	(revision 4834)
+++ /1121s/branch/shutter/yc1089s_fouse_public/format/app_shutter_dy.format	(working copy)
@@ -220,6 +220,9 @@
 1 mem_shutter_adc_read_time_init
 1 mem_shutter_low_volatge_led_time
 1 mem_shutter_low_voltage_led_status
+1 mem_shutter_double_photo_time_android
+1 mem_shutter_double_photo_time_ios
+5 mem_shutter_dy_step_mode_android
 0 mem_shutter_dy_end
 )
 
Index: output/otp.dat
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/output/otp.dat	(revision 4834)
+++ /1121s/branch/shutter/yc1089s_fouse_public/output/otp.dat	(working copy)
@@ -11,16 +11,16 @@
 00
 aa
 55
-d6
-11
+16
+0f
 c2
 84
 00
-18
+15
 c0
 00
 00
-51
+4e
 c0
 01
 01
@@ -32,7 +32,7 @@
 c0
 0a
 03
-0a
+04
 c0
 0a
 81
@@ -52,11 +52,11 @@
 c0
 12
 83
-2c
+26
 c0
 13
 80
-7c
+79
 c0
 51
 80
@@ -68,7 +68,7 @@
 c0
 53
 00
-87
+84
 c0
 53
 80
@@ -84,7 +84,7 @@
 c0
 62
 00
-1f
+1c
 c0
 62
 81
@@ -92,19 +92,7 @@
 c0
 6d
 02
-f3
-c0
-6d
-84
-1c
-c0
-6e
-04
-59
-c0
-6e
-84
-3a
+ed
 20
 20
 23
@@ -112,7 +100,7 @@
 c0
 12
 00
-55
+52
 c0
 12
 80
@@ -124,11 +112,11 @@
 c0
 1c
 83
-26
+20
 c0
 26
 83
-2a
+24
 c1
 7f
 80
@@ -172,7 +160,7 @@
 20
 20
 80
-49
+46
 6f
 f0
 80
@@ -292,11 +280,11 @@
 20
 20
 80
-25
+22
 c5
 11
 00
-49
+46
 79
 20
 00
@@ -304,7 +292,7 @@
 20
 20
 00
-26
+23
 6f
 f1
 00
@@ -328,11 +316,11 @@
 24
 20
 80
-25
+22
 c2
 00
 00
-22
+1f
 20
 20
 6b
@@ -360,7 +348,7 @@
 c5
 97
 80
-5b
+58
 78
 3c
 fc
@@ -404,7 +392,7 @@
 20
 37
 00
-64
+61
 1b
 42
 04
@@ -452,7 +440,7 @@
 20
 40
 00
-72
+6f
 6f
 e0
 81
@@ -572,15 +560,15 @@
 c0
 03
 00
-90
+8d
 c0
 03
 80
-94
+91
 c0
 04
 00
-98
+95
 c0
 04
 80
@@ -621,6 +609,18 @@
 20
 63
 71
+70
+49
+e5
+dc
+da
+60
+4f
+f9
+20
+20
+63
+71
 20
 60
 00
@@ -1124,7 +1124,7 @@
 20
 40
 03
-95
+8f
 da
 60
 4f
@@ -1140,7 +1140,7 @@
 20
 40
 03
-b8
+b2
 da
 60
 4f
@@ -1412,11 +1412,11 @@
 20
 40
 02
-c5
+bf
 20
 40
 02
-f0
+ea
 20
 40
 01
@@ -1432,7 +1432,7 @@
 20
 20
 02
-f2
+ec
 20
 75
 80
@@ -1899,8 +1899,8 @@
 00
 20
 40
-03
-cb
+63
+d9
 20
 40
 01
@@ -1924,7 +1924,7 @@
 58
 00
 02
-54
+3c
 67
 e1
 43
@@ -1932,7 +1932,7 @@
 58
 00
 02
-31
+19
 67
 e1
 43
@@ -1940,7 +1940,7 @@
 58
 00
 02
-46
+2e
 67
 e1
 43
@@ -2111,20 +2111,12 @@
 dd
 20
 40
-03
-e0
-20
-40
-03
-cd
-20
-40
 02
-29
+b5
 20
 40
 02
-1b
+ba
 20
 40
 67
@@ -2136,7 +2128,7 @@
 20
 40
 02
-14
+12
 20
 20
 64
@@ -2148,7 +2140,7 @@
 da
 40
 02
-17
+15
 20
 20
 42
@@ -2169,94 +2161,6 @@
 20
 63
 9e
-da
-60
-4f
-e4
-da
-40
-02
-1e
-20
-20
-42
-e0
-70
-4f
-e6
-00
-6f
-e0
-cf
-e5
-c0
-00
-82
-23
-c0
-01
-02
-25
-20
-20
-02
-2e
-20
-40
-02
-2e
-20
-20
-67
-40
-20
-40
-02
-2e
-70
-4f
-e6
-04
-da
-60
-4a
-5d
-20
-20
-63
-71
-da
-60
-4f
-e6
-da
-40
-02
-2c
-20
-20
-42
-e0
-da
-60
-4b
-ea
-20
-20
-63
-71
-70
-4f
-e5
-00
-70
-4f
-e4
-00
-20
-60
-00
-00
 1a
 62
 7e
@@ -2264,19 +2168,19 @@
 c0
 20
 02
-3d
+25
 c0
 18
 82
-3b
+23
 c0
 0a
 82
-38
+20
 c0
 0a
 02
-37
+1f
 20
 20
 64
@@ -2328,7 +2232,7 @@
 24
 3a
 02
-51
+39
 6f
 e4
 4f
@@ -2348,7 +2252,7 @@
 c0
 12
 02
-49
+31
 20
 60
 00
@@ -2372,7 +2276,7 @@
 24
 3a
 02
-51
+39
 6f
 e4
 4f
@@ -2400,7 +2304,7 @@
 20
 40
 02
-5f
+47
 d8
 e0
 00
@@ -2436,11 +2340,11 @@
 20
 40
 02
-79
+61
 20
 20
 03
-55
+4f
 6f
 e1
 44
@@ -2448,7 +2352,7 @@
 c2
 84
 82
-64
+4c
 d8
 a0
 45
@@ -2496,7 +2400,7 @@
 24
 21
 02
-70
+58
 6f
 e0
 c9
@@ -2608,7 +2512,7 @@
 20
 40
 02
-96
+7e
 6f
 e1
 06
@@ -2656,7 +2560,7 @@
 c2
 00
 02
-82
+6a
 20
 60
 00
@@ -2700,7 +2604,7 @@
 20
 20
 02
-a0
+88
 1a
 60
 8c
@@ -2712,7 +2616,7 @@
 20
 20
 02
-a3
+8b
 20
 40
 65
@@ -2728,7 +2632,7 @@
 20
 40
 02
-bd
+ad
 18
 e2
 7e
@@ -2736,19 +2640,19 @@
 c0
 03
 02
-ad
+95
 c0
 03
 82
-af
+97
 c0
 04
 02
-b1
+99
 c0
 04
 82
-b8
+a0
 20
 20
 65
@@ -2772,7 +2676,7 @@
 20
 40
 02
-b3
+9b
 20
 20
 63
@@ -2797,26 +2701,58 @@
 60
 00
 00
-6f
-e0
-cf
-e5
-1f
-e0
-fe
-01
-67
-e0
-cf
-e5
-70
-4f
-e4
-04
 20
-60
-00
-00
+40
+02
+a2
+20
+20
+63
+71
+20
+40
+67
+30
+c0
+00
+02
+a5
+c0
+00
+82
+a9
+da
+60
+4a
+5d
+20
+40
+63
+71
+70
+4f
+f7
+0b
+20
+60
+00
+00
+da
+60
+4b
+84
+20
+40
+63
+71
+70
+4f
+f8
+0b
+20
+60
+00
+00
 da
 60
 4a
@@ -2824,7 +2760,7 @@
 70
 49
 e5
-0a
+14
 20
 40
 67
@@ -2844,11 +2780,51 @@
 70
 49
 e5
-78
+14
 20
 60
 00
 00
+da
+60
+4f
+f7
+da
+40
+02
+b8
+20
+20
+42
+e0
+da
+60
+4b
+ea
+20
+20
+63
+71
+da
+60
+4f
+f8
+da
+40
+02
+bd
+20
+20
+42
+e0
+da
+60
+4b
+f4
+20
+20
+63
+71
 20
 75
 80
@@ -2900,7 +2876,7 @@
 20
 40
 02
-e2
+dc
 2a
 2f
 fe
@@ -2932,7 +2908,7 @@
 20
 40
 02
-e2
+dc
 d8
 a0
 8a
@@ -2960,7 +2936,7 @@
 20
 21
 02
-d7
+d1
 20
 20
 21
@@ -3063,8 +3039,8 @@
 b8
 20
 40
-03
-03
+02
+fd
 70
 8a
 08
@@ -3107,8 +3083,8 @@
 29
 c3
 02
-83
-04
+82
+fe
 68
 59
 01
@@ -3144,7 +3120,7 @@
 c0
 08
 03
-23
+1d
 58
 00
 57
@@ -3188,7 +3164,7 @@
 c0
 08
 03
-20
+1a
 58
 00
 2b
@@ -3224,7 +3200,7 @@
 20
 20
 03
-1c
+16
 58
 00
 83
@@ -3236,7 +3212,7 @@
 20
 20
 03
-11
+0b
 6f
 e0
 c3
@@ -3284,7 +3260,7 @@
 20
 40
 03
-3d
+37
 6f
 e0
 c0
@@ -3396,7 +3372,7 @@
 20
 22
 83
-50
+4a
 e7
 e0
 80
@@ -3416,7 +3392,7 @@
 c2
 00
 03
-4a
+44
 1a
 42
 04
@@ -3464,7 +3440,7 @@
 24
 21
 03
-67
+61
 1a
 20
 a2
@@ -3476,7 +3452,7 @@
 24
 3a
 03
-5b
+55
 da
 20
 00
@@ -3484,7 +3460,7 @@
 20
 40
 03
-6c
+66
 1c
 42
 7e
@@ -3540,11 +3516,11 @@
 20
 40
 03
-73
+6d
 20
 20
 03
-6d
+67
 da
 60
 4f
@@ -3552,7 +3528,7 @@
 da
 40
 03
-76
+70
 20
 20
 42
@@ -3564,11 +3540,11 @@
 c0
 00
 83
-7a
+74
 c0
 01
 03
-9d
+97
 20
 60
 00
@@ -3580,11 +3556,11 @@
 24
 3a
 03
-89
+83
 70
 49
 e5
-01
+14
 70
 4f
 d9
@@ -3608,7 +3584,7 @@
 20
 42
 83
-95
+8f
 da
 60
 4f
@@ -3616,7 +3592,7 @@
 20
 40
 03
-c0
+ba
 ef
 e1
 00
@@ -3636,7 +3612,7 @@
 20
 40
 03
-c8
+c2
 6f
 e0
 cf
@@ -3656,7 +3632,7 @@
 20
 42
 83
-95
+8f
 da
 60
 4f
@@ -3664,7 +3640,7 @@
 20
 40
 03
-c0
+ba
 ef
 e1
 00
@@ -3700,7 +3676,7 @@
 20
 40
 03
-c0
+ba
 58
 00
 06
@@ -3720,11 +3696,11 @@
 24
 3a
 03
-ac
+a6
 70
 49
 e5
-01
+14
 70
 4f
 d9
@@ -3748,7 +3724,7 @@
 20
 42
 83
-b8
+b2
 da
 60
 4f
@@ -3756,7 +3732,7 @@
 20
 40
 03
-c0
+ba
 ef
 e1
 00
@@ -3776,7 +3752,7 @@
 20
 40
 03
-c8
+c2
 6f
 e0
 cf
@@ -3796,7 +3772,7 @@
 20
 42
 83
-b8
+b2
 da
 60
 4f
@@ -3804,7 +3780,7 @@
 20
 40
 03
-c0
+ba
 ef
 e1
 00
@@ -3840,7 +3816,7 @@
 20
 40
 03
-c0
+ba
 58
 00
 0a
@@ -3897,699 +3873,19 @@
 60
 00
 00
-70
-4f
-ef
-01
-20
-60
+b7
+ec
+aa
+55
+40
 00
 00
-6f
-e0
-cf
-ef
-20
-7a
+40
+05
 00
-00
-6f
-e0
-cf
-f1
-20
-7a
-00
-00
-da
-60
-4f
-f5
-da
-40
-03
-d4
-20
-20
-42
-e0
-70
-4f
-f5
-05
-6f
-e0
-cf
-f6
-79
-40
-7e
-00
-67
-e0
-cf
-f6
-c0
-00
-c3
-23
-20
-20
-43
-25
-6f
-e0
-cf
-f0
-1f
-e0
-fe
-01
-67
-e0
-cf
-f0
-68
-48
-cf
-f4
-98
-46
-7c
-00
-20
-60
-00
-00
-6f
-e0
-cf
-ef
-20
-7a
-00
-00
-20
-40
-03
-da
-24
-61
-00
-00
-70
-4f
-f0
-00
-70
-44
-07
-01
-20
-40
-6f
-f3
-20
-40
-6f
-eb
-20
-40
-04
-59
-20
-40
-04
-3a
-67
-e1
-4f
-ed
-da
-20
-4f
-e7
-20
-40
-03
-f2
-6f
-e0
-c4
-0c
-c2
-80
-84
-12
-c3
-00
-04
-16
-70
-4f
-f2
-01
-20
-20
-04
-14
-ef
-e4
-00
-11
-67
-e4
-06
-70
-20
-40
-6f
-f3
-20
-40
-6f
-eb
-6f
-e1
-06
-76
-68
-49
-06
-72
-98
-46
-7c
-00
-24
-41
-6f
-ef
-68
-49
-06
-74
-98
-46
-7c
-00
-24
-41
-6f
-e7
-6f
-e1
-06
-76
-68
-49
-06
-70
-98
-46
-7c
-00
-20
-21
-04
-0e
-68
-49
-06
-72
-98
-46
-7e
-00
-24
-21
-04
-10
-20
-3a
-04
-10
-1f
-ef
-a2
-64
-6f
-e1
-06
-70
-68
-49
-06
-72
-98
-46
-04
-00
-1a
-22
-7e
-00
-98
-46
-fc
-00
-20
-40
-7d
-5f
-67
-e0
-cf
-f3
-20
-60
-00
-00
-70
-4f
-f3
-64
-20
-60
-00
-00
-70
-4f
-f3
-00
-20
-60
-00
-00
-20
-40
-43
-25
-20
-20
-43
-27
-70
-4f
-f1
-01
-20
-60
-00
-00
-70
-4f
-f1
-00
-6f
-e0
-cf
-f2
-20
-7a
-00
-00
-20
-40
-43
-25
-70
-4f
-f2
-00
-20
-60
-00
-00
-6f
-e4
-01
-fd
-20
-3a
-6f
-79
-67
-e4
-43
-fd
-20
-40
-6b
-3a
-20
-40
-6a
-ad
-df
-e0
-0f
-c0
-9a
-40
-a4
-00
-df
-20
-00
-0a
-da
-20
-01
-fd
-20
-40
-6b
-74
-20
-40
-6b
-37
-6f
-e4
-01
-fd
-20
-7a
-00
-00
-67
-e4
-41
-4e
-ef
-e1
-00
-06
-e7
-e1
-00
-05
-20
-60
-00
-00
-6f
-f0
-80
-cc
-79
-20
-7e
-01
-67
-f0
-80
-cc
-6a
-40
-c4
-19
-6f
-e0
-c4
-33
-67
-e0
-c4
-19
-df
-20
-00
-08
-20
-40
-6f
-67
-62
-40
-c4
-19
-6f
-f0
-8a
-0a
-79
-3f
-fe
-04
-67
-f0
-8a
-0a
-20
-60
-00
-00
-6f
-e0
-c4
-07
-c0
-00
-84
-3e
-c0
-01
-04
-45
-20
-60
-00
-00
-58
-00
-03
-e8
-67
-e1
-44
-05
-68
-49
-41
-52
-6f
-e1
-41
-54
-da
-60
-0e
-10
-20
-40
-6f
-c0
-20
-20
-04
-4b
-58
-00
-03
-e8
-67
-e1
-44
-05
-68
-49
-41
-4e
-6f
-e1
-41
-50
-da
-60
-03
-e8
-20
-40
-6f
-c0
-68
-49
-41
-56
-98
-4f
-fe
-00
-68
-49
-41
-58
-98
-46
-fc
-00
-20
-20
-7d
-5f
-20
-40
-04
-2d
-6f
-f0
-8a
-09
-79
-3f
-fe
-07
-67
-f0
-8a
-09
-70
-8a
-07
-77
-70
-8a
-08
-c1
-70
-8a
-0d
-61
-70
-8a
-0b
-00
-20
-60
-00
-00
-20
-40
-04
-50
-20
-40
-6f
-90
-6f
-e0
-c4
-09
-67
-f0
-80
-cd
-20
-40
-6f
-97
-70
-8a
-0d
-60
-70
-80
-cd
-00
-20
-40
-04
-50
-6f
-e0
-c4
-09
-67
-f0
-80
-cd
-70
-8a
-0b
-50
-70
-8a
-0e
-c0
-df
-00
-00
-0b
-6d
-e1
-44
-0a
-70
-80
-cc
-03
-20
-40
-04
-72
-68
-59
-01
-64
-60
-49
-41
-58
-20
-40
-6f
-9c
-df
-00
-00
-0b
-65
-e1
-44
-0a
-70
-8a
-0d
-60
-70
-80
-cd
-00
-70
-80
-cc
-00
-20
-60
-00
-00
-6f
-f0
-81
-29
-c3
-02
-84
-72
-20
-60
-00
-00
-6d
-c1
-aa
-55
-40
-00
-00
-40
-05
-00
-32
-07
-a0
+32
+07
+a0
 00
 00
 00
@@ -4612,7 +3908,7 @@
 30
 00
 00
-3c
+04
 00
 00
 00
@@ -4669,7 +3965,7 @@
 00
 db
 42
-0b
+0d
 21
 20
 98
@@ -4677,17 +3973,19 @@
 2a
 aa
 55
-07
+09
 00
 6b
 42
-06
+08
 53
 65
 6c
 66
 69
 65
+20
+31
 aa
 55
 08
@@ -4747,7 +4045,7 @@
 00
 d0
 46
-00
+01
 aa
 55
 16
@@ -4756,14 +4054,14 @@
 4f
 00
 00
-8c
+93
 46
 00
 96
 00
 01
 03
-8c
+93
 46
 00
 96
@@ -4831,16 +4129,16 @@
 e3
 4e
 0a
-ff
-15
 08
-0a
-14
-ff
-06
 07
-0d
-ff
+0f
+12
+02
+06
+03
+00
+01
+0e
 aa
 55
 0a
@@ -5167,14 +4465,14 @@
 00
 28
 00
+32
+31
+30
+2f
 25
 24
 23
 22
-21
-20
-1f
-1e
 1d
 00
 29
@@ -5189,11 +4487,22 @@
 4f
 02
 01
+2b
+2c
+00
 2d
 2e
 00
-2f
-30
+aa
+55
+05
+00
+f9
+4f
+1b
+1c
+1b
+1c
 00
 aa
 55
@@ -5248,7 +4557,7 @@
 01
 aa
 55
-70
+a4
 02
 02
 4c
@@ -5374,12 +4683,12 @@
 00
 00
 f4
-06
-40
+02
+80
 02
 04
 f4
-06
+02
 40
 02
 0a
@@ -5387,12 +4696,12 @@
 00
 83
 f4
-06
+02
 80
 03
 04
 f4
-06
+02
 80
 03
 0a
@@ -5400,12 +4709,12 @@
 00
 83
 f4
-06
+02
 40
 04
 04
 f4
-06
+02
 40
 04
 0a
@@ -5413,12 +4722,12 @@
 00
 83
 f4
-06
+02
 80
 05
 04
 f4
-06
+02
 80
 05
 0a
@@ -5426,12 +4735,12 @@
 00
 83
 f4
-06
+02
 40
 06
 04
 f4
-06
+02
 40
 06
 0a
@@ -5439,12 +4748,12 @@
 00
 83
 f4
-06
+02
 80
 07
 04
 f4
-06
+02
 80
 07
 0a
@@ -5452,144 +4761,144 @@
 00
 83
 f4
-06
-80
+02
+40
 08
 04
 f4
-06
-80
+02
+40
 08
 0a
 23
 00
 83
 f4
-06
-40
+02
+80
 09
 04
 f4
-06
-40
+02
+80
 09
 0a
 23
 00
 00
 f4
-06
-80
+02
+40
 0a
 04
 f4
-06
-80
+02
+40
 0a
 0a
 23
 00
 00
-00
-02
 40
-0a
+00
+80
+07
 04
+40
 00
-02
 40
-0a
+04
 0a
 23
 00
 83
-00
+80
 02
-40
-0a
+80
+07
 04
-00
+80
 02
 40
-0a
+04
 0a
 23
 00
 83
 40
 04
-40
-0a
+80
+07
 04
 40
-04
+05
 40
-0a
+04
 0a
 23
 00
 83
 80
 06
-40
-0a
+80
+07
 04
 80
-06
+07
 40
-0a
+04
 0a
 23
 00
 83
 40
 08
-40
-0a
+80
+07
 04
 40
-08
+09
 40
-0a
+04
 0a
 23
 00
 83
 80
 0a
-40
-0a
+80
+07
 04
 80
-0a
+0b
 40
-0a
+04
 0a
 23
 00
 83
 40
 0c
-40
-0a
+80
+07
 04
 40
-0c
+0d
 40
-0a
+04
 0a
 23
 00
 00
-40
-0c
-40
-0a
+80
+0d
+80
+07
 04
+80
+0e
 40
-0c
-40
-0a
+04
 0a
 23
 00
@@ -5621,12 +4930,12 @@
 00
 00
 00
-01
-00
-06
+04
+a0
+08
 04
 00
-01
+04
 00
 03
 0a
@@ -5634,12 +4943,12 @@
 00
 83
 00
-01
-00
-06
+04
+40
+08
 87
 00
-01
+04
 00
 03
 0a
@@ -5647,12 +4956,12 @@
 00
 83
 00
-01
-10
-06
+04
+60
+08
 87
 00
-01
+04
 00
 03
 0a
@@ -5660,12 +4969,12 @@
 00
 83
 00
-01
-20
-06
+04
+80
+08
 87
 00
-01
+04
 00
 03
 0a
@@ -5673,12 +4982,12 @@
 00
 83
 00
-01
-30
-06
+04
+90
+08
 87
 00
-01
+04
 00
 03
 0a
@@ -5686,12 +4995,12 @@
 00
 83
 00
-01
-40
-06
+04
+a0
+08
 87
 00
-01
+04
 00
 03
 0a
@@ -5699,12 +5008,12 @@
 00
 83
 00
-01
-50
-06
+04
+b0
+08
 87
 00
-01
+04
 00
 03
 0a
@@ -5712,12 +5021,12 @@
 00
 83
 00
-01
-60
-06
+04
+d0
+08
 87
 00
-01
+04
 00
 03
 0a
@@ -5725,12 +5034,12 @@
 00
 83
 00
-01
-70
-06
+04
+e0
+08
 87
 00
-01
+04
 00
 03
 0a
@@ -5738,12 +5047,12 @@
 00
 00
 00
-01
-70
-06
+04
+e0
+08
 04
 00
-01
+04
 00
 03
 0a
@@ -5751,12 +5060,12 @@
 00
 83
 00
-01
-50
-06
+04
+f0
+08
 87
 00
-01
+04
 00
 03
 0a
@@ -5764,12 +5073,12 @@
 00
 00
 00
-01
-50
-06
+04
+f0
+08
 00
 00
-01
+04
 00
 03
 0a
@@ -5777,12 +5086,12 @@
 00
 83
 00
-01
+04
 00
-0a
+08
 87
 00
-01
+04
 00
 03
 0a
@@ -5790,92 +5099,144 @@
 00
 00
 00
-01
+04
 00
-0a
+08
 00
 00
-01
+04
 00
 03
 0a
 23
 00
 83
+80
+0d
+f1
+0d
+04
+80
+0d
+f1
+0d
+0a
+23
+00
+00
+80
+0d
+f1
+0d
+04
+80
+0d
+f1
+0d
+0a
+23
+00
+83
+b0
+0e
+45
+0e
+04
 00
 0f
-a0
+20
 01
+0a
+23
+00
+00
+b0
+0e
+45
+0e
 04
 00
 0f
-a0
+20
 01
 0a
 23
 00
+83
 00
+04
+10
+09
+87
 00
-0f
-a0
-01
 04
 00
-0f
-a0
-01
+03
 0a
 23
 00
 83
-a0
-0d
-a1
-0d
+00
 04
-a0
-0d
-a1
-0d
+20
+09
+87
+00
+04
+00
+03
 0a
 23
 00
+83
 00
-a0
-0d
-a1
-0d
 04
-a0
-0d
-a1
-0d
+30
+09
+87
+00
+04
+00
+03
 0a
 23
 00
 83
 00
-0e
-10
-0e
 04
+50
+09
+87
 00
-0f
-20
-01
+04
+00
+03
 0a
 23
 00
+83
+f0
+07
+1c
+0e
+04
+f0
+07
+1c
+0e
+0a
+23
 00
 00
-0e
-10
+f0
+07
+1c
 0e
 04
-00
-0f
-20
-01
+f0
+07
+1c
+0e
 aa
 55
 03
@@ -6660,7 +6021,7 @@
 00
 1c
 41
-2f
+3a
 aa
 55
 0c
@@ -6804,7 +6165,7 @@
 aa
 aa
 55
-ff
-73
-d5
-9e
+60
+87
+50
+86
Index: output/ramcode.rom
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/output/ramcode.rom	(revision 4834)
+++ /1121s/branch/shutter/yc1089s_fouse_public/output/ramcode.rom	(working copy)
@@ -1,32 +1,29 @@
-c2840018
-c0000051
+c2840015
+c000004e
 c001011f
 c0088128
-c00a030a
+c00a0304
 c00a81b5
 c00c01c3
 c00c8182
 c00d013a
-c012832c
-c013807c
+c0128326
+c0138079
 c05180c4
 c05280fc
-c0530087
+c0530084
 c053809a
 c05500ec
 c05881d5
-c062001f
+c062001c
 c06281ca
-c06d02f3
-c06d841c
-c06e0459
-c06e843a
+c06d02ed
 2020235a
-c0120055
+c0120052
 c01280d5
 c01300da
-c01c8326
-c026832a
+c01c8320
+c0268324
 c17f8000
 2020235a
 20406b34
@@ -37,7 +34,7 @@
 18000e00
 793f8022
 a84c0000
-20208049
+20208046
 6ff08046
 79207e06
 79207e07
@@ -67,24 +64,24 @@
 70804782
 20000001
 afec0000
-20208025
-c5110049
+20208022
+c5110046
 79200022
-20200026
+20200023
 6ff10044
 1fe0fe01
 67f10044
 18e08e01
 28e01e08
-24208025
-c2000022
+24208022
+c200001f
 20206b38
 2435a002
 37d98200
 37d98200
 20202002
 204025c2
-c597805b
+c5978058
 783cfc00
 2000001e
 204025c2
@@ -95,7 +92,7 @@
 78507c00
 19623600
 37c18400
-20370064
+20370061
 1b420400
 604b000f
 242c26fa
@@ -107,7 +104,7 @@
 984fb600
 20406877
 20372677
-20400072
+2040006f
 6fe08168
 c301a677
 2055a477
@@ -137,9 +134,9 @@
 c000e777
 c002e765
 c0006761
-c0030090
-c0038094
-c0040098
+c003008d
+c0038091
+c0040095
 c0048099
 202065a2
 704fd902
@@ -150,6 +147,9 @@
 704fda02
 da604fc6
 20206371
+7049e5dc
+da604ff9
+20206371
 20600000
 20600000
 6fe0cec7
@@ -275,11 +275,11 @@
 dfe00003
 2020655a
 2040011c
-20400395
+2040038f
 da604fc4
 20206371
 2040011c
-204003b8
+204003b2
 da604fd2
 20206371
 704fd900
@@ -347,12 +347,12 @@
 58557474
 67f18968
 7089606e
-204002c5
-204002f0
+204002bf
+204002ea
 20400163
 7041480c
 20406f4e
-202002f2
+202002ec
 20758000
 37d98200
 6fe0c11c
@@ -469,17 +469,17 @@
 20207cda
 20407396
 20758000
-204003cb
+204063d9
 204001cd
 20406459
 58000001
 67e144f6
 7040a60a
-58000254
+5800023c
 67e143db
-58000231
+58000219
 67e143dd
-58000246
+5800022e
 67e143df
 580062d3
 67e143d3
@@ -522,48 +522,24 @@
 20600000
 79200407
 20206edd
-204003e0
-204003cd
-20400229
-2040021b
+204002b5
+204002ba
 2040676c
 2040675a
-20400214
+20400212
 202064d9
 da604518
-da400217
+da400215
 202042e7
 70451c02
 20404325
 2040634e
 2020639e
-da604fe4
-da40021e
-202042e0
-704fe600
-6fe0cfe5
-c0008223
-c0010225
-2020022e
-2040022e
-20206740
-2040022e
-704fe604
-da604a5d
-20206371
-da604fe6
-da40022c
-202042e0
-da604bea
-20206371
-704fe500
-704fe400
-20600000
 1a627e00
-c020023d
-c018823b
-c00a8238
-c00a0237
+c0200225
+c0188223
+c00a8220
+c00a021f
 202064e0
 202064f4
 6fe14512
@@ -576,25 +552,25 @@
 6fe4450a
 207a0000
 20406730
-243a0251
+243a0239
 6fe44f02
 67e442d3
 20202e93
 6fe14398
-c0120249
+c0120231
 20600000
 204078ad
 7044f101
 20406730
 2040432b
-243a0251
+243a0239
 6fe44f02
 67e442d3
 20202e93
 6fe44fb0
 67e442d3
 20202e93
-2040025f
+20400247
 d8e00009
 20407cef
 247a0000
@@ -603,10 +579,10 @@
 20407ce1
 78547c00
 2040701b
-20400279
-20200355
+20400261
+2020034f
 6fe144e9
-c2848264
+c284824c
 d8a045da
 df200023
 20207ca1
@@ -618,7 +594,7 @@
 1c427e00
 98460400
 20628000
-24210270
+24210258
 6fe0c9e5
 98467c00
 20610000
@@ -646,7 +622,7 @@
 67e1068c
 18e27e00
 67e1067a
-20400296
+2040027e
 6fe1068c
 1fe22600
 6fe1067a
@@ -658,7 +634,7 @@
 1fe0a60a
 6fe10678
 1fe27200
-c2000282
+c200026a
 20600000
 1a60a405
 efe20012
@@ -669,44 +645,62 @@
 24417806
 580003e8
 98467c00
-202002a0
+20200288
 1a608c04
 efe08006
-202002a3
+2020028b
 2040656b
 20406561
 20216500
-204002bd
+204002ad
 18e27e00
-c00302ad
-c00382af
-c00402b1
-c00482b8
+c0030295
+c0038297
+c0040299
+c00482a0
 20206558
 da604fb8
 20206371
 da604fc6
 20206371
-204002b3
+2040029b
 20206371
 da604fdc
 20406730
 207a0000
 da604fe1
 20600000
-6fe0cfe5
-1fe0fe01
-67e0cfe5
-704fe404
+204002a2
+20206371
+20406730
+c00002a5
+c00082a9
+da604a5d
+20406371
+704ff70b
+20600000
+da604b84
+20406371
+704ff80b
 20600000
 da604a30
-7049e50a
+7049e514
 20406730
 207a0000
 da604b57
 18e27e00
-7049e578
+7049e514
 20600000
+da604ff7
+da4002b8
+202042e0
+da604bea
+20206371
+da604ff8
+da4002bd
+202042e0
+da604bf4
+20206371
 20758000
 20402160
 d8400027
@@ -719,7 +713,7 @@
 708ac200
 708ac300
 d8e00006
-204002e2
+204002dc
 2a2ffe0d
 2040211d
 2a4ffe0d
@@ -727,14 +721,14 @@
 d8e00005
 2040211c
 2040211e
-204002e2
+204002dc
 d8a08ac2
 1a31fe00
 20402117
 1a51fe00
 20402117
 18e08fff
-202102d7
+202102d1
 2020214f
 2000003c
 58000f00
@@ -760,7 +754,7 @@
 6fe0c409
 67f080cd
 20000bb8
-20400303
+204002fd
 708a08c1
 6a40c419
 df200008
@@ -771,7 +765,7 @@
 20600000
 7080cc03
 6ff08129
-c3028304
+c30282fe
 68590164
 6049440a
 7080cc00
@@ -780,7 +774,7 @@
 708a8d12
 708a8e0a
 6fe0c099
-c0080323
+c008031d
 58005762
 67f10907
 70890103
@@ -791,7 +785,7 @@
 708a8d44
 708a8e0a
 6fe0c099
-c0080320
+c008031a
 58002bb1
 67f10907
 c6978000
@@ -800,10 +794,10 @@
 20600000
 58004189
 67f10907
-2020031c
+20200316
 58008312
 67f10907
-20200311
+2020030b
 6fe0c334
 c1000000
 c001b04a
@@ -815,7 +809,7 @@
 6fe240ad
 9840fe00
 67e240ad
-2040033d
+20400337
 6fe0c0cb
 79207e04
 204023e1
@@ -843,12 +837,12 @@
 efe08011
 e8408013
 98467c00
-20228350
+2022834a
 e7e08013
 37d98200
 1a20a201
 1a60a601
-c200034a
+c2000344
 1a420400
 20600000
 da200000
@@ -860,12 +854,12 @@
 1a427e00
 18408440
 98467c00
-24210367
+24210361
 1a20a201
 1a217e0f
-243a035b
+243a0355
 da200000
-2040036c
+20400366
 1c427e00
 67e24fd5
 20600000
@@ -879,38 +873,38 @@
 207a0000
 1fe0ffff
 67e0cfd4
-20400373
-2020036d
+2040036d
+20200367
 da604fd9
-da400376
+da400370
 202042e0
 6fe0cfda
-c000837a
-c001039d
+c0008374
+c0010397
 20600000
 20406730
-243a0389
-7049e501
+243a0383
+7049e514
 704fd901
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c5a
-20428395
+2042838f
 da604fc2
-204003c0
+204003ba
 efe1003f
 1fe0fe0a
 e7e10011
 20206371
-204003c8
+204003c2
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c5a
-20428395
+2042838f
 da604fc2
-204003c0
+204003ba
 efe1003f
 1fe0fe0a
 e7e10011
@@ -919,33 +913,33 @@
 da604fc4
 20406371
 da604fc2
-204003c0
+204003ba
 58000650
 e7e10011
 20600000
 20406730
-243a03ac
-7049e501
+243a03a6
+7049e514
 704fd901
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c5a
-204283b8
+204283b2
 da604fd0
-204003c0
+204003ba
 efe1003f
 1fe0fff6
 e7e10011
 20206371
-204003c8
+204003c2
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c3c
-204283b8
+204283b2
 da604fd0
-204003c0
+204003ba
 efe1003f
 1fe0fff6
 e7e10011
@@ -954,7 +948,7 @@
 da604fd2
 20406371
 da604fd0
-204003c0
+204003ba
 58000a00
 e7e10011
 20600000
@@ -969,173 +963,3 @@
 7049e501
 704fd902
 20600000
-704fef01
-20600000
-6fe0cfef
-207a0000
-6fe0cff1
-207a0000
-da604ff5
-da4003d4
-202042e0
-704ff505
-6fe0cff6
-79407e00
-67e0cff6
-c000c323
-20204325
-6fe0cff0
-1fe0fe01
-67e0cff0
-6848cff4
-98467c00
-20600000
-6fe0cfef
-207a0000
-204003da
-24610000
-704ff000
-70440701
-20406ff3
-20406feb
-20400459
-2040043a
-67e14fed
-da204fe7
-204003f2
-6fe0c40c
-c2808412
-c3000416
-704ff201
-20200414
-efe40011
-67e40670
-20406ff3
-20406feb
-6fe10676
-68490672
-98467c00
-24416fef
-68490674
-98467c00
-24416fe7
-6fe10676
-68490670
-98467c00
-2021040e
-68490672
-98467e00
-24210410
-203a0410
-1fefa264
-6fe10670
-68490672
-98460400
-1a227e00
-9846fc00
-20407d5f
-67e0cff3
-20600000
-704ff364
-20600000
-704ff300
-20600000
-20404325
-20204327
-704ff101
-20600000
-704ff100
-6fe0cff2
-207a0000
-20404325
-704ff200
-20600000
-6fe401fd
-203a6f79
-67e443fd
-20406b3a
-20406aad
-dfe00fc0
-9a40a400
-df20000a
-da2001fd
-20406b74
-20406b37
-6fe401fd
-207a0000
-67e4414e
-efe10006
-e7e10005
-20600000
-6ff080cc
-79207e01
-67f080cc
-6a40c419
-6fe0c433
-67e0c419
-df200008
-20406f67
-6240c419
-6ff08a0a
-793ffe04
-67f08a0a
-20600000
-6fe0c407
-c000843e
-c0010445
-20600000
-580003e8
-67e14405
-68494152
-6fe14154
-da600e10
-20406fc0
-2020044b
-580003e8
-67e14405
-6849414e
-6fe14150
-da6003e8
-20406fc0
-68494156
-984ffe00
-68494158
-9846fc00
-20207d5f
-2040042d
-6ff08a09
-793ffe07
-67f08a09
-708a0777
-708a08c1
-708a0d61
-708a0b00
-20600000
-20400450
-20406f90
-6fe0c409
-67f080cd
-20406f97
-708a0d60
-7080cd00
-20400450
-6fe0c409
-67f080cd
-708a0b50
-708a0ec0
-df00000b
-6de1440a
-7080cc03
-20400472
-68590164
-60494158
-20406f9c
-df00000b
-65e1440a
-708a0d60
-7080cd00
-7080cc00
-20600000
-6ff08129
-c3028472
-20600000
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/output/sched.rom	(revision 4834)
+++ /1121s/branch/shutter/yc1089s_fouse_public/output/sched.rom	(working copy)
@@ -26,7 +26,7 @@
 30   #mem_patch18
 00   #mem_patch19
 00   #mem_patch1a
-3c   #mem_patch1b
+04   #mem_patch1b
 00   #mem_patch1c
 00   #mem_patch1d
 00   #mem_patch1e
@@ -70,9 +70,9 @@
 #power on config
 mem_ui_button_gpio:ff
 
-mem_le_lap:0b 21 20 98 07 2a
+mem_le_lap:0d 21 20 98 07 2a
 mem_le_name_len:
-'Selfie
+'Selfie 1
 
 mem_tx_power:06
 
@@ -91,21 +91,21 @@
 
 mem_shutter_dy_conf:01
 #soft switch first power on
-mem_shutter_soft_switch_first_power_on:00
+mem_shutter_soft_switch_first_power_on:01
 
 #led config
 mem_shutter_led_on_light_dark_led_conf:
 00		#type:stop blink
 00		#blink count:no blink
-# 93
-8c		#led gpio number:GPIO01
+93
+#0c		#led gpio number:GPIO01
 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
-# 93
-8c		#led gpio number:GPIO01
+93
+#0c		#led gpio number:GPIO01
 46 00	#led blink light time
 96 00	#led blink dark time
 
@@ -140,16 +140,52 @@
 mem_shutter_key_num_conf:0a
 mem_shutter_dy_key_conf:
 #test 9key
-ff   #right
-15   #like
-08   #down
-0a   #photo
-14   #up
-ff   #left
-06   #fouse up
-07   #fouse down
-0d   #mode step
-ff   #photo2
+# ff   #right
+# 15   #like
+# 08   #down
+# 0a   #photo
+# 14   #up
+# ff   #left
+# 06   #fouse up
+# 07   #fouse down
+# 0d   #mode step
+# ff   #photo2
+
+#JM199
+# 14   #right  k6
+# 02   #like   k1
+# 06   #down   k4
+# 01   #photo  k3
+# 0c   #up     k7
+# 13   #left   k5
+# ff   #fouse up
+# ff   #fouse down
+# 00   #mode step
+# ff   #photo2
+
+#JM130
+# ff   #right
+# ff   #like
+# ff   #down
+# 13   #photo
+# ff   #up
+# ff   #left
+# 14   #fouse up
+# 08   #fouse down
+# ff   #mode step
+# ff   #photo2
+
+#dy 10key
+08   #right
+07   #like
+0f   #down
+12   #photo
+02   #up
+06   #left
+03   #fouse up
+00   #fouse down
+01  #mode step
+0e   #photo2
 
 #JM118 10key
 # 0e   #right
@@ -261,8 +297,10 @@
 04 01 00
 #photo
 mem_key3_release_new:#volume increment
+#03 01 33 34 00
 03 01 00
 mem_key3_release_new_t:#volume decrement
+#04 01 33 34 00
 04 01 00
 #up
 mem_key4_release_new:
@@ -281,13 +319,15 @@
 mem_fouse_up_long_press:27 00
 mem_fouse_up_long_release:28 00
 
-mem_fouse_down_press:25 24 23 22 21 20 1f 1e 1d 00
+#mem_fouse_down_press:25 24 23 22 21 20 1f 1e 1d 00
+mem_fouse_down_press:32 31 30 2f 25 24 23 22 1d 00
 mem_fouse_down_long_press:29 00
 mem_fouse_down_long_release:2a 00
 
-mem_shutter_mode_step_android:02 01 2d 2e 00#2b 2c 2d 2e 00
-mem_shutter_mode_step_ios:2f 30 00
+mem_shutter_mode_step_android:02 01 2b 2c 00
+mem_shutter_mode_step_ios:2d 2e 00
 
+mem_shutter_dy_step_mode_android:1b 1c 1b 1c 00
 ################################### fouse config  end ######################################
 
 mem_combine_key0_press:01
@@ -314,51 +354,98 @@
 02 1b 00 40 00 00 00 00 00 00 00 00 00 #8  zoom in
 02 1b 00 80 00 00 00 00 00 00 00 00 00 #9  zoom out
 #up and down
-0a 23 00 00 f4 06 40 02 04 f4 06 40 02 #a
-0a 23 00 83 f4 06 80 03 04 f4 06 80 03 #b
-0a 23 00 83 f4 06 40 04 04 f4 06 40 04 #c
-0a 23 00 83 f4 06 80 05 04 f4 06 80 05 #d
-0a 23 00 83 f4 06 40 06 04 f4 06 40 06 #e
-0a 23 00 83 f4 06 80 07 04 f4 06 80 07 #f
-0a 23 00 83 f4 06 80 08 04 f4 06 80 08 #10
-0a 23 00 83 f4 06 40 09 04 f4 06 40 09 #11
-0a 23 00 00 f4 06 80 0a 04 f4 06 80 0a #12
+0a 23 00 00 f4 02 80 02 04 f4 02 40 02 #a
+0a 23 00 83 f4 02 80 03 04 f4 02 80 03 #b
+0a 23 00 83 f4 02 40 04 04 f4 02 40 04 #c
+0a 23 00 83 f4 02 80 05 04 f4 02 80 05 #d
+0a 23 00 83 f4 02 40 06 04 f4 02 40 06 #e
+0a 23 00 83 f4 02 80 07 04 f4 02 80 07 #f
+0a 23 00 83 f4 02 40 08 04 f4 02 40 08 #10
+0a 23 00 83 f4 02 80 09 04 f4 02 80 09 #11
+0a 23 00 00 f4 02 40 0a 04 f4 02 40 0a #12
 #right and left
-0a 23 00 00 00 02 40 0a 04 00 02 40 0a #13
-0a 23 00 83 00 02 40 0a 04 00 02 40 0a #14
-0a 23 00 83 40 04 40 0a 04 40 04 40 0a #15
-0a 23 00 83 80 06 40 0a 04 80 06 40 0a #16
-0a 23 00 83 40 08 40 0a 04 40 08 40 0a #17
-0a 23 00 83 80 0a 40 0a 04 80 0a 40 0a #18
-0a 23 00 83 40 0c 40 0a 04 40 0c 40 0a #19
-0a 23 00 00 40 0c 40 0a 04 40 0c 40 0a #1a
+# 0a 23 00 00 80 00 40 04 04 40 00 40 04 #13
+# 0a 23 00 83 40 02 40 04 04 80 02 40 04 #14
+# 0a 23 00 83 80 04 40 04 04 40 05 40 04 #15
+# 0a 23 00 83 40 06 40 04 04 80 07 40 04 #16
+# 0a 23 00 83 80 08 40 04 04 40 09 40 04 #17
+# 0a 23 00 83 40 0a 40 04 04 80 0b 40 04 #18
+# 0a 23 00 83 80 0c 40 04 04 40 0d 40 04 #19
+# 0a 23 00 00 40 0e 40 04 04 80 0e 40 04 #1a
+
+0a 23 00 00 40 00 80 07 04 40 00 40 04 #13
+0a 23 00 83 80 02 80 07 04 80 02 40 04 #14
+0a 23 00 83 40 04 80 07 04 40 05 40 04 #15
+0a 23 00 83 80 06 80 07 04 80 07 40 04 #16
+0a 23 00 83 40 08 80 07 04 40 09 40 04 #17
+0a 23 00 83 80 0a 80 07 04 80 0b 40 04 #18
+0a 23 00 83 40 0c 80 07 04 40 0d 40 04 #19
+0a 23 00 00 80 0d 80 07 04 80 0e 40 04 #1a
 #like
 0a 23 00 83 f0 07 80 07 04 f0 07 80 07 #1b
 0a 23 00 00 f0 07 80 07 04 f0 07 80 07 #1c
-#fouse
-0a 23 00 00 00 01 00 06 04 00 01 00 03 #1d
-0a 23 00 83 00 01 00 06 87 00 01 00 03 #1e
-0a 23 00 83 00 01 10 06 87 00 01 00 03 #1f
-0a 23 00 83 00 01 20 06 87 00 01 00 03 #20
-0a 23 00 83 00 01 30 06 87 00 01 00 03 #21
-0a 23 00 83 00 01 40 06 87 00 01 00 03 #22
-0a 23 00 83 00 01 50 06 87 00 01 00 03 #23
-0a 23 00 83 00 01 60 06 87 00 01 00 03 #24
-0a 23 00 83 00 01 70 06 87 00 01 00 03 #25
-0a 23 00 00 00 01 70 06 04 00 01 00 03 #26
+#fouse +
+# 0a 23 00 00 00 06 00 06 04 00 06 00 05 #1d
+# 0a 23 00 83 00 06 00 06 87 00 06 00 05 #1e
+# 0a 23 00 83 00 06 10 06 87 00 06 00 05 #1f
+# 0a 23 00 83 00 06 20 06 87 00 06 00 05 #20
+# 0a 23 00 83 00 06 30 06 87 00 06 00 06 #21
+# 0a 23 00 83 00 06 40 06 87 00 06 00 05 #22
+# 0a 23 00 83 00 06 50 06 87 00 06 00 05 #23
+# 0a 23 00 83 00 06 60 06 87 00 06 00 05 #24
+# 0a 23 00 83 00 06 70 06 87 00 06 00 05 #25
+# 0a 23 00 00 00 06 70 06 04 00 06 00 05 #26
+
+0a 23 00 00 00 04 a0 08 04 00 04 00 03 #1d
+0a 23 00 83 00 04 40 08 87 00 04 00 03 #1e
+0a 23 00 83 00 04 60 08 87 00 04 00 03 #1f
+0a 23 00 83 00 04 80 08 87 00 04 00 03 #20
+0a 23 00 83 00 04 90 08 87 00 04 00 03 #21
+0a 23 00 83 00 04 a0 08 87 00 04 00 03 #22
+0a 23 00 83 00 04 b0 08 87 00 04 00 03 #23
+0a 23 00 83 00 04 d0 08 87 00 04 00 03 #24
+0a 23 00 83 00 04 e0 08 87 00 04 00 03 #25
+0a 23 00 00 00 04 e0 08 04 00 04 00 03 #26
+
 #fouse long press
-0a 23 00 83 00 01 50 06 87 00 01 00 03 #27
-0a 23 00 00 00 01 50 06 00 00 01 00 03 #28
-0a 23 00 83 00 01 00 0a 87 00 01 00 03 #29
-0a 23 00 00 00 01 00 0a 00 00 01 00 03 #2a
+# 0a 23 00 83 00 06 50 06 87 00 06 00 06 #27
+# 0a 23 00 00 00 06 50 06 00 00 06 00 06 #28
+# 0a 23 00 83 00 06 00 0a 87 00 06 00 06 #29
+# 0a 23 00 00 00 06 00 0a 00 00 06 00 06 #2a
+
+0a 23 00 83 00 04 f0 08 87 00 04 00 03 #27
+0a 23 00 00 00 04 f0 08 00 00 04 00 03 #28
+0a 23 00 83 00 04 00 08 87 00 04 00 03 #29
+0a 23 00 00 00 04 00 08 00 00 04 00 03 #2a
+
 #android mode step
-0a 23 00 83 00 0f a0 01 04 00 0f a0 01 #2b
-0a 23 00 00 00 0f a0 01 04 00 0f a0 01 #2c
-0a 23 00 83 a0 0d a1 0d 04 a0 0d a1 0d #2d
-0a 23 00 00 a0 0d a1 0d 04 a0 0d a1 0d #2e
+# 0a 23 00 83 00 0f a0 01 04 00 0f a0 01 #2b
+# 0a 23 00 00 00 0f a0 01 04 00 0f a0 01 #2c
+0a 23 00 83 80 0d f1 0d 04 80 0d f1 0d #2b
+0a 23 00 00 80 0d f1 0d 04 80 0d f1 0d #2c
 #ios mode step
-0a 23 00 83 00 0e 10 0e 04 00 0f 20 01 #2f
-0a 23 00 00 00 0e 10 0e 04 00 0f 20 01 #30
+#se
+# 0a 23 00 83 80 0e f0 0e 04 00 0f 20 01 #2d
+# 0a 23 00 00 80 0e f0 0e 04 00 0f 20 01 #2e
+
+#xs
+# 0a 23 00 83 50 0e f0 0d 04 00 0f 20 01 #2d
+# 0a 23 00 00 50 0e f0 0d 04 00 0f 20 01 #2e
+
+0a 23 00 83 b0 0e 45 0e 04 00 0f 20 01 #2d
+0a 23 00 00 b0 0e 45 0e 04 00 0f 20 01 #2e
+
+#fouse - plus
+0a 23 00 83 00 04 10 09 87 00 04 00 03 #2f
+0a 23 00 83 00 04 20 09 87 00 04 00 03 #30
+0a 23 00 83 00 04 30 09 87 00 04 00 03 #31
+0a 23 00 83 00 04 50 09 87 00 04 00 03 #32
+
+#photo touch
+0a 23 00 83 f0 07 1c 0e 04 f0 07 1c 0e #33
+0a 23 00 00 f0 07 1c 0e 04 f0 07 1c 0e #34
+# 0a 23 00 83 f0 07 80 07 04 f0 07 80 07 #33
+# 0a 23 00 00 f0 07 80 07 04 f0 07 80 07 #34
 
 mem_shutter_move_data:
 00 00 00  #defualt
@@ -640,7 +727,7 @@
 mem_lpm_hv_sel:b4
 
 mem_fcomp_div:18
-mem_xtal_c_sel:2f
+mem_xtal_c_sel:3a
 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/yc1089s_fouse_public/program/patch.prog	(revision 4834)
+++ /1121s/branch/shutter/yc1089s_fouse_public/program/patch.prog	(working copy)
@@ -1,6 +1,6 @@
 
 
-define ADC_1121SB
+//define ADC_1121SB
 ifdef ADC_1121SB
 //define ADC_1121SB_1V8_MODE
 endif
@@ -195,6 +195,9 @@
 	branch push_buffer_in_queue
 
 p_shutter_key_fun2_long_press:
+	jam 220,mem_send_data_delay
+	arg mem_shutter_dy_step_mode_android,regc
+	branch push_buffer_in_queue
 	rtn
 
 p_shutter_key_fun3_long_press:
@@ -607,6 +610,7 @@
 p_shutter_dy_init:
 	call enable_authrom
 	rtn wake
+	call shutter_default_init
 ifdef ADC_1121SB
 	call p_shutter_adc_config_init
 endif	
@@ -691,8 +695,9 @@
 	call p_shutter_adc_read_timer
 	call p_shutter_low_volatage_led_timer
 endif
-	call p_shutter_photo_double_timer
-	call p_shutter_photo_event_timer
+	call p_shutter_double_photo_timer_android
+	call p_shutter_double_photo_timer_ios
+	//call p_shutter_photo_event_timer
 	call shutter_dy_link_key_loop_timer
 	call shutter_dy_long_key_volume_timer
 	call p_shutter_check_sleep_timer
@@ -708,39 +713,25 @@
 	call shutter_disconnect_current_connection
 	branch shutter_wait_power_off
 
-p_shutter_photo_event_timer:
-	arg mem_shutter_photo_time,regc
-	arg p_shutter_photo_event_timeout,regb
-	branch timer_single_step
-p_shutter_photo_event_timeout:
-	jam 0,mem_shutter_photo_double_time
-	fetch 1,mem_shutter_photo_click_count
-	beq 1,p_shutter_photo_event_one
-	beq 2,p_shutter_photo_event_double
-	branch p_shutter_photo_event_clear
-
-p_shutter_photo_event_one:
-	call p_shutter_photo_event_clear
-	branch shutter_dy_le_get_release_ptr_volume
-
-p_shutter_photo_event_double:
-	call p_shutter_photo_event_clear
-	jam 4,mem_shutter_photo_double_time
-	arg mem_key3_release_new,regc
-	branch push_buffer_in_queue
-
-p_shutter_photo_double_timer:
-	arg mem_shutter_photo_double_time,regc
-	arg p_shutter_photo_event2_timeout,regb
-	branch timer_single_step
-p_shutter_photo_event2_timeout:
-	arg mem_key3_release_new_t,regc
-	branch push_buffer_in_queue
-
-p_shutter_photo_event_clear:
-	jam 0,mem_shutter_photo_click_count
-	jam 0,mem_shutter_photo_time
-	rtn
+// p_shutter_photo_event_timer:
+// 	arg mem_shutter_photo_time,regc
+// 	arg p_shutter_photo_event_timeout,regb
+// 	branch timer_single_step
+// p_shutter_photo_event_timeout:
+// 	//jam 0,mem_shutter_photo_double_time
+// 	fetch 1,mem_shutter_photo_click_count
+// 	beq 1,p_shutter_photo_event_one
+// 	//beq 2,p_shutter_photo_event_double
+// 	branch p_shutter_photo_event_clear
+
+// p_shutter_photo_event_one:
+// 	call p_shutter_photo_event_clear
+// 	branch shutter_dy_le_get_release_ptr_volume
+
+// p_shutter_photo_event_clear:
+// 	jam 0,mem_shutter_photo_click_count
+// 	jam 0,mem_shutter_photo_time
+// 	rtn
 
 p_shutter_dy_process_bb_event:
 	copy regc,pdata
@@ -895,10 +886,10 @@
 	branch shutter_dy_over_clear,positive
 	call p_shutter_dy_le_get_release_ptr
 	copy queue,pdata
-	beq SHUTTER_FUN_KEY_NUM,p_shutter_fun_key_release
-	beq SHUTTER_FUN1_KEY_NUM,p_shutter_fun1_key_release
-	beq SHUTTER_FUN2_KEY_NUM,p_shutter_fun2_key_release
-	beq SHUTTER_FUN3_KEY_NUM,p_shutter_fun3_key_release
+	beq SHUTTER_FUN_KEY_NUM,p_shutter_fun_key_release   //fouse up
+	beq SHUTTER_FUN1_KEY_NUM,p_shutter_fun1_key_release // fouse down
+	beq SHUTTER_FUN2_KEY_NUM,p_shutter_fun2_key_release // step mode
+	beq SHUTTER_FUN3_KEY_NUM,p_shutter_fun3_key_release // double photo
 	branch shutter_dy_push_queue_release1_next+4
 
 p_shutter_fun_key_release:
@@ -921,23 +912,56 @@
 	rtn
 
 p_shutter_fun3_key_release:
-	fetch 1,mem_shutter_photo_click_count
-	increase 1,pdata
-	store 1,mem_shutter_photo_click_count
-	jam 4,mem_shutter_photo_time
+ 	call p_shutter_double_photo
+	branch push_buffer_in_queue
+
+p_shutter_double_photo:
+	call shutter_dy_check_iphone
+	beq 0,p_shutter_double_photo_android
+	beq 1,p_shutter_double_photo_ios
+	
+p_shutter_double_photo_android:
+	arg mem_key3_release_new,regc
+    call push_buffer_in_queue
+	jam 11,mem_shutter_double_photo_time_android
+	rtn
+
+p_shutter_double_photo_ios:
+	arg mem_key3_release_new_i,regc
+	call push_buffer_in_queue
+	jam 11,mem_shutter_double_photo_time_ios
 	rtn
 
 p_shutter_dy_le_get_release_ptr:
 p_shutter_dy_le_get_release_ptr_set:
 	arg mem_key0_release_new,regc
-	jam 10,mem_send_data_delay
+	jam 20,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
+	jam 20,mem_send_data_delay
 	rtn
 
+p_shutter_double_photo_timer_android:
+	arg mem_shutter_double_photo_time_android,regc
+	arg p_shutter_double_photo_timeout_android,regb
+	branch timer_single_step
+
+p_shutter_double_photo_timeout_android:
+	arg mem_key3_release_new_t,regc
+    branch push_buffer_in_queue
+
+p_shutter_double_photo_timer_ios:
+	arg mem_shutter_double_photo_time_ios,regc
+	arg p_shutter_double_photo_timeout_ios,regb
+	branch timer_single_step
+
+p_shutter_double_photo_timeout_ios:
+	arg mem_key3_release_new_i_t,regc
+    branch push_buffer_in_queue
+
+
 p_rx_dcoc:
 //	bpatch patch01_7,mem_patch01
 	rtn wake
@@ -1173,7 +1197,7 @@
 p_shutter_dy_fouseup_event:
 	call shutter_dy_check_iphone
 	nbranch p_shutter_dy_fouseup_event_ios,blank
-	jam 1,mem_send_data_delay
+	jam 20,mem_send_data_delay
 	jam 1,mem_shutter_dy_fouse_time
 	fetch 1,mem_shutter_dy_fouse_count
 	increase 1,pdata
@@ -1214,7 +1238,7 @@
 p_shutter_dy_fousedown_event:
 	call shutter_dy_check_iphone
 	nbranch p_shutter_dy_fousedown_event_ios,blank
-	jam 1,mem_send_data_delay
+	jam 20,mem_send_data_delay
 	jam 1,mem_shutter_dy_fouse_time
 	fetch 1,mem_shutter_dy_fouse_count
 	increase 1,pdata
Index: sched/1305.dat
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/sched/1305.dat	(revision 4834)
+++ /1121s/branch/shutter/yc1089s_fouse_public/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:3a
 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/yc1089s_fouse_public/sched/shutter_dy.dat	(revision 4834)
+++ /1121s/branch/shutter/yc1089s_fouse_public/sched/shutter_dy.dat	(working copy)
@@ -3,7 +3,7 @@
 #power on config
 mem_ui_button_gpio:ff
 
-mem_le_lap:0b 21 20 98 07 2a
+mem_le_lap:0d 21 20 98 07 2a
 mem_le_name_len:
 'Selfie
 
@@ -24,21 +24,21 @@
 
 mem_shutter_dy_conf:01
 #soft switch first power on
-mem_shutter_soft_switch_first_power_on:00
+mem_shutter_soft_switch_first_power_on:01
 
 #led config
 mem_shutter_led_on_light_dark_led_conf:
 00		#type:stop blink
 00		#blink count:no blink
-# 93
-8c		#led gpio number:GPIO01
+93
+#0c		#led gpio number:GPIO01
 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
-# 93
-8c		#led gpio number:GPIO01
+93
+#0c		#led gpio number:GPIO01
 46 00	#led blink light time
 96 00	#led blink dark time
 
@@ -73,16 +73,52 @@
 mem_shutter_key_num_conf:0a
 mem_shutter_dy_key_conf:
 #test 9key
-ff   #right
-15   #like
-08   #down
-0a   #photo
-14   #up
-ff   #left
-06   #fouse up
-07   #fouse down
-0d   #mode step
-ff   #photo2
+# ff   #right
+# 15   #like
+# 08   #down
+# 0a   #photo
+# 14   #up
+# ff   #left
+# 06   #fouse up
+# 07   #fouse down
+# 0d   #mode step
+# ff   #photo2
+
+#JM199
+# 14   #right  k6
+# 02   #like   k1
+# 06   #down   k4
+# 01   #photo  k3
+# 0c   #up     k7
+# 13   #left   k5
+# ff   #fouse up
+# ff   #fouse down
+# 00   #mode step
+# ff   #photo2
+
+#JM130
+# ff   #right
+# ff   #like
+# ff   #down
+# 13   #photo
+# ff   #up
+# ff   #left
+# 14   #fouse up
+# 08   #fouse down
+# ff   #mode step
+# ff   #photo2
+
+#dy 10key
+08   #right
+07   #like
+0f   #down
+12   #photo
+02   #up
+06   #left
+03   #fouse up
+00   #fouse down
+01  #mode step
+0e   #photo2
 
 #JM118 10key
 # 0e   #right
@@ -194,8 +230,10 @@
 04 01 00
 #photo
 mem_key3_release_new:#volume increment
+#03 01 33 34 00
 03 01 00
 mem_key3_release_new_t:#volume decrement
+#04 01 33 34 00
 04 01 00
 #up
 mem_key4_release_new:
@@ -214,13 +252,15 @@
 mem_fouse_up_long_press:27 00
 mem_fouse_up_long_release:28 00
 
-mem_fouse_down_press:25 24 23 22 21 20 1f 1e 1d 00
+#mem_fouse_down_press:25 24 23 22 21 20 1f 1e 1d 00
+mem_fouse_down_press:32 31 30 2f 25 24 23 22 1d 00
 mem_fouse_down_long_press:29 00
 mem_fouse_down_long_release:2a 00
 
-mem_shutter_mode_step_android:02 01 2d 2e 00#2b 2c 2d 2e 00
-mem_shutter_mode_step_ios:2f 30 00
+mem_shutter_mode_step_android:02 01 2b 2c 00
+mem_shutter_mode_step_ios:2d 2e 00
 
+mem_shutter_dy_step_mode_android:1b 1c 1b 1c 00
 ################################### fouse config  end ######################################
 
 mem_combine_key0_press:01
@@ -247,51 +287,98 @@
 02 1b 00 40 00 00 00 00 00 00 00 00 00 #8  zoom in
 02 1b 00 80 00 00 00 00 00 00 00 00 00 #9  zoom out
 #up and down
-0a 23 00 00 f4 06 40 02 04 f4 06 40 02 #a
-0a 23 00 83 f4 06 80 03 04 f4 06 80 03 #b
-0a 23 00 83 f4 06 40 04 04 f4 06 40 04 #c
-0a 23 00 83 f4 06 80 05 04 f4 06 80 05 #d
-0a 23 00 83 f4 06 40 06 04 f4 06 40 06 #e
-0a 23 00 83 f4 06 80 07 04 f4 06 80 07 #f
-0a 23 00 83 f4 06 80 08 04 f4 06 80 08 #10
-0a 23 00 83 f4 06 40 09 04 f4 06 40 09 #11
-0a 23 00 00 f4 06 80 0a 04 f4 06 80 0a #12
+0a 23 00 00 f4 02 80 02 04 f4 02 40 02 #a
+0a 23 00 83 f4 02 80 03 04 f4 02 80 03 #b
+0a 23 00 83 f4 02 40 04 04 f4 02 40 04 #c
+0a 23 00 83 f4 02 80 05 04 f4 02 80 05 #d
+0a 23 00 83 f4 02 40 06 04 f4 02 40 06 #e
+0a 23 00 83 f4 02 80 07 04 f4 02 80 07 #f
+0a 23 00 83 f4 02 40 08 04 f4 02 40 08 #10
+0a 23 00 83 f4 02 80 09 04 f4 02 80 09 #11
+0a 23 00 00 f4 02 40 0a 04 f4 02 40 0a #12
 #right and left
-0a 23 00 00 00 02 40 0a 04 00 02 40 0a #13
-0a 23 00 83 00 02 40 0a 04 00 02 40 0a #14
-0a 23 00 83 40 04 40 0a 04 40 04 40 0a #15
-0a 23 00 83 80 06 40 0a 04 80 06 40 0a #16
-0a 23 00 83 40 08 40 0a 04 40 08 40 0a #17
-0a 23 00 83 80 0a 40 0a 04 80 0a 40 0a #18
-0a 23 00 83 40 0c 40 0a 04 40 0c 40 0a #19
-0a 23 00 00 40 0c 40 0a 04 40 0c 40 0a #1a
+# 0a 23 00 00 80 00 40 04 04 40 00 40 04 #13
+# 0a 23 00 83 40 02 40 04 04 80 02 40 04 #14
+# 0a 23 00 83 80 04 40 04 04 40 05 40 04 #15
+# 0a 23 00 83 40 06 40 04 04 80 07 40 04 #16
+# 0a 23 00 83 80 08 40 04 04 40 09 40 04 #17
+# 0a 23 00 83 40 0a 40 04 04 80 0b 40 04 #18
+# 0a 23 00 83 80 0c 40 04 04 40 0d 40 04 #19
+# 0a 23 00 00 40 0e 40 04 04 80 0e 40 04 #1a
+
+0a 23 00 00 40 00 80 07 04 40 00 40 04 #13
+0a 23 00 83 80 02 80 07 04 80 02 40 04 #14
+0a 23 00 83 40 04 80 07 04 40 05 40 04 #15
+0a 23 00 83 80 06 80 07 04 80 07 40 04 #16
+0a 23 00 83 40 08 80 07 04 40 09 40 04 #17
+0a 23 00 83 80 0a 80 07 04 80 0b 40 04 #18
+0a 23 00 83 40 0c 80 07 04 40 0d 40 04 #19
+0a 23 00 00 80 0d 80 07 04 80 0e 40 04 #1a
 #like
 0a 23 00 83 f0 07 80 07 04 f0 07 80 07 #1b
 0a 23 00 00 f0 07 80 07 04 f0 07 80 07 #1c
-#fouse
-0a 23 00 00 00 01 00 06 04 00 01 00 03 #1d
-0a 23 00 83 00 01 00 06 87 00 01 00 03 #1e
-0a 23 00 83 00 01 10 06 87 00 01 00 03 #1f
-0a 23 00 83 00 01 20 06 87 00 01 00 03 #20
-0a 23 00 83 00 01 30 06 87 00 01 00 03 #21
-0a 23 00 83 00 01 40 06 87 00 01 00 03 #22
-0a 23 00 83 00 01 50 06 87 00 01 00 03 #23
-0a 23 00 83 00 01 60 06 87 00 01 00 03 #24
-0a 23 00 83 00 01 70 06 87 00 01 00 03 #25
-0a 23 00 00 00 01 70 06 04 00 01 00 03 #26
+#fouse +
+# 0a 23 00 00 00 06 00 06 04 00 06 00 05 #1d
+# 0a 23 00 83 00 06 00 06 87 00 06 00 05 #1e
+# 0a 23 00 83 00 06 10 06 87 00 06 00 05 #1f
+# 0a 23 00 83 00 06 20 06 87 00 06 00 05 #20
+# 0a 23 00 83 00 06 30 06 87 00 06 00 06 #21
+# 0a 23 00 83 00 06 40 06 87 00 06 00 05 #22
+# 0a 23 00 83 00 06 50 06 87 00 06 00 05 #23
+# 0a 23 00 83 00 06 60 06 87 00 06 00 05 #24
+# 0a 23 00 83 00 06 70 06 87 00 06 00 05 #25
+# 0a 23 00 00 00 06 70 06 04 00 06 00 05 #26
+
+0a 23 00 00 00 04 a0 08 04 00 04 00 03 #1d
+0a 23 00 83 00 04 40 08 87 00 04 00 03 #1e
+0a 23 00 83 00 04 60 08 87 00 04 00 03 #1f
+0a 23 00 83 00 04 80 08 87 00 04 00 03 #20
+0a 23 00 83 00 04 90 08 87 00 04 00 03 #21
+0a 23 00 83 00 04 a0 08 87 00 04 00 03 #22
+0a 23 00 83 00 04 b0 08 87 00 04 00 03 #23
+0a 23 00 83 00 04 d0 08 87 00 04 00 03 #24
+0a 23 00 83 00 04 e0 08 87 00 04 00 03 #25
+0a 23 00 00 00 04 e0 08 04 00 04 00 03 #26
+
 #fouse long press
-0a 23 00 83 00 01 50 06 87 00 01 00 03 #27
-0a 23 00 00 00 01 50 06 00 00 01 00 03 #28
-0a 23 00 83 00 01 00 0a 87 00 01 00 03 #29
-0a 23 00 00 00 01 00 0a 00 00 01 00 03 #2a
+# 0a 23 00 83 00 06 50 06 87 00 06 00 06 #27
+# 0a 23 00 00 00 06 50 06 00 00 06 00 06 #28
+# 0a 23 00 83 00 06 00 0a 87 00 06 00 06 #29
+# 0a 23 00 00 00 06 00 0a 00 00 06 00 06 #2a
+
+0a 23 00 83 00 04 f0 08 87 00 04 00 03 #27
+0a 23 00 00 00 04 f0 08 00 00 04 00 03 #28
+0a 23 00 83 00 04 00 08 87 00 04 00 03 #29
+0a 23 00 00 00 04 00 08 00 00 04 00 03 #2a
+
 #android mode step
-0a 23 00 83 00 0f a0 01 04 00 0f a0 01 #2b
-0a 23 00 00 00 0f a0 01 04 00 0f a0 01 #2c
-0a 23 00 83 a0 0d a1 0d 04 a0 0d a1 0d #2d
-0a 23 00 00 a0 0d a1 0d 04 a0 0d a1 0d #2e
+# 0a 23 00 83 00 0f a0 01 04 00 0f a0 01 #2b
+# 0a 23 00 00 00 0f a0 01 04 00 0f a0 01 #2c
+0a 23 00 83 80 0d f1 0d 04 80 0d f1 0d #2b
+0a 23 00 00 80 0d f1 0d 04 80 0d f1 0d #2c
 #ios mode step
-0a 23 00 83 00 0e 10 0e 04 00 0f 20 01 #2f
-0a 23 00 00 00 0e 10 0e 04 00 0f 20 01 #30
+#se
+# 0a 23 00 83 80 0e f0 0e 04 00 0f 20 01 #2d
+# 0a 23 00 00 80 0e f0 0e 04 00 0f 20 01 #2e
+
+#xs
+# 0a 23 00 83 50 0e f0 0d 04 00 0f 20 01 #2d
+# 0a 23 00 00 50 0e f0 0d 04 00 0f 20 01 #2e
+
+0a 23 00 83 b0 0e 45 0e 04 00 0f 20 01 #2d
+0a 23 00 00 b0 0e 45 0e 04 00 0f 20 01 #2e
+
+#fouse - plus
+0a 23 00 83 00 04 10 09 87 00 04 00 03 #2f
+0a 23 00 83 00 04 20 09 87 00 04 00 03 #30
+0a 23 00 83 00 04 30 09 87 00 04 00 03 #31
+0a 23 00 83 00 04 50 09 87 00 04 00 03 #32
+
+#photo touch
+0a 23 00 83 f0 07 1c 0e 04 f0 07 1c 0e #33
+0a 23 00 00 f0 07 1c 0e 04 f0 07 1c 0e #34
+# 0a 23 00 83 f0 07 80 07 04 f0 07 80 07 #33
+# 0a 23 00 00 f0 07 80 07 04 f0 07 80 07 #34
 
 mem_shutter_move_data:
 00 00 00  #defualt