Index: format/app_shutter_dy.format
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/format/app_shutter_dy.format	(revision 5225)
+++ /1121s/branch/shutter/yc1089s_fouse_public/format/app_shutter_dy.format	(working copy)
@@ -198,7 +198,7 @@
 1 mem_shutter_fouse_select
 1 mem_shutter_dy_fouse_count
 5 mem_shutter_mode_step_android
-3 mem_shutter_mode_step_ios
+5 mem_shutter_mode_step_ios_release
 1 mem_shutter_photo_time
 1 mem_shutter_photo_click_count
 1 mem_shutter_photo_double_time
@@ -220,8 +220,6 @@
 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 5225)
+++ /1121s/branch/shutter/yc1089s_fouse_public/output/otp.dat	(working copy)
@@ -11,7 +11,7 @@
 00
 aa
 55
-d6
+7a
 11
 c2
 84
@@ -31,8 +31,8 @@
 2b
 c0
 0a
-03
-0a
+02
+f3
 c0
 0a
 81
@@ -52,7 +52,7 @@
 c0
 12
 83
-2c
+15
 c0
 13
 80
@@ -92,19 +92,19 @@
 c0
 6d
 02
-f3
+dc
 c0
 6d
 84
-1c
+05
 c0
 6e
 04
-59
+42
 c0
 6e
 84
-3a
+23
 20
 20
 23
@@ -124,11 +124,11 @@
 c0
 1c
 83
-26
+0f
 c0
 26
 83
-2a
+13
 c1
 7f
 80
@@ -1136,7 +1136,7 @@
 20
 40
 03
-95
+7e
 da
 60
 4f
@@ -1152,7 +1152,7 @@
 20
 40
 03
-b8
+a1
 da
 60
 4f
@@ -1424,11 +1424,11 @@
 20
 40
 02
-c5
+ae
 20
 40
 02
-f0
+d9
 20
 40
 01
@@ -1444,7 +1444,7 @@
 20
 20
 02
-f2
+db
 20
 75
 80
@@ -1916,7 +1916,11 @@
 20
 40
 03
-cb
+b4
+70
+40
+94
+00
 20
 40
 01
@@ -1940,7 +1944,7 @@
 58
 00
 02
-42
+41
 67
 e1
 43
@@ -1948,7 +1952,7 @@
 58
 00
 02
-1f
+1e
 67
 e1
 43
@@ -1956,7 +1960,7 @@
 58
 00
 02
-34
+33
 67
 e1
 43
@@ -1972,7 +1976,7 @@
 58
 00
 01
-fb
+fc
 67
 e1
 43
@@ -1988,7 +1992,7 @@
 58
 00
 02
-10
+11
 67
 e1
 43
@@ -2052,7 +2056,7 @@
 20
 40
 02
-00
+01
 20
 40
 70
@@ -2096,7 +2100,7 @@
 20
 22
 82
-0b
+0c
 1f
 e2
 04
@@ -2104,7 +2108,7 @@
 20
 40
 02
-0e
+0f
 1a
 20
 a2
@@ -2112,7 +2116,7 @@
 c2
 00
 02
-05
+06
 20
 60
 00
@@ -2128,19 +2132,11 @@
 20
 40
 03
-e0
+c9
 20
 40
 03
-cd
-20
-40
-02
-bb
-20
-40
-02
-c0
+b6
 20
 40
 67
@@ -2152,7 +2148,7 @@
 20
 40
 02
-18
+17
 20
 20
 64
@@ -2164,7 +2160,7 @@
 da
 40
 02
-1b
+1a
 20
 20
 42
@@ -2192,19 +2188,19 @@
 c0
 20
 02
-2b
+2a
 c0
 18
 82
-29
+28
 c0
 0a
 82
-26
+25
 c0
 0a
 02
-25
+24
 20
 20
 64
@@ -2256,7 +2252,7 @@
 24
 3a
 02
-3f
+3e
 6f
 e4
 4f
@@ -2276,7 +2272,7 @@
 c0
 12
 02
-37
+36
 20
 60
 00
@@ -2300,7 +2296,7 @@
 24
 3a
 02
-3f
+3e
 6f
 e4
 4f
@@ -2328,7 +2324,7 @@
 20
 40
 02
-4d
+4c
 d8
 e0
 00
@@ -2364,11 +2360,11 @@
 20
 40
 02
-67
+66
 20
 20
 03
-55
+3e
 6f
 e1
 44
@@ -2376,7 +2372,7 @@
 c2
 84
 82
-52
+51
 d8
 a0
 45
@@ -2424,7 +2420,7 @@
 24
 21
 02
-5e
+5d
 6f
 e0
 c9
@@ -2536,7 +2532,7 @@
 20
 40
 02
-84
+83
 6f
 e1
 06
@@ -2584,7 +2580,7 @@
 c2
 00
 02
-70
+6f
 20
 60
 00
@@ -2628,7 +2624,7 @@
 20
 20
 02
-8e
+8d
 1a
 60
 8c
@@ -2640,7 +2636,7 @@
 20
 20
 02
-91
+90
 20
 40
 65
@@ -2656,7 +2652,7 @@
 20
 40
 02
-b3
+a6
 18
 e2
 7e
@@ -2664,19 +2660,19 @@
 c0
 03
 02
-9b
+9a
 c0
 03
 82
-9d
+9c
 c0
 04
 02
-9f
+9e
 c0
 04
 82
-a6
+a5
 20
 20
 65
@@ -2700,7 +2696,7 @@
 20
 40
 02
-a1
+a0
 20
 20
 63
@@ -2726,54 +2722,6 @@
 00
 00
 20
-40
-02
-a8
-20
-20
-63
-71
-20
-40
-67
-30
-c0
-00
-02
-ab
-c0
-00
-82
-af
-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
@@ -2809,46 +2757,6 @@
 60
 00
 00
-da
-60
-4f
-f7
-da
-40
-02
-be
-20
-20
-42
-e0
-da
-60
-4b
-ea
-20
-20
-63
-71
-da
-60
-4f
-f8
-da
-40
-02
-c3
-20
-20
-42
-e0
-da
-60
-4b
-f4
-20
-20
-63
-71
 20
 75
 80
@@ -2900,7 +2808,7 @@
 20
 40
 02
-e2
+cb
 2a
 2f
 fe
@@ -2932,7 +2840,7 @@
 20
 40
 02
-e2
+cb
 d8
 a0
 8a
@@ -2960,7 +2868,7 @@
 20
 21
 02
-d7
+c0
 20
 20
 21
@@ -3063,8 +2971,8 @@
 b8
 20
 40
-03
-03
+02
+ec
 70
 8a
 08
@@ -3107,8 +3015,8 @@
 29
 c3
 02
-83
-04
+82
+ed
 68
 59
 01
@@ -3144,7 +3052,7 @@
 c0
 08
 03
-23
+0c
 58
 00
 57
@@ -3188,7 +3096,7 @@
 c0
 08
 03
-20
+09
 58
 00
 2b
@@ -3224,7 +3132,7 @@
 20
 20
 03
-1c
+05
 58
 00
 83
@@ -3235,8 +3143,8 @@
 07
 20
 20
-03
-11
+02
+fa
 6f
 e0
 c3
@@ -3284,7 +3192,7 @@
 20
 40
 03
-3d
+26
 6f
 e0
 c0
@@ -3396,7 +3304,7 @@
 20
 22
 83
-50
+39
 e7
 e0
 80
@@ -3416,7 +3324,7 @@
 c2
 00
 03
-4a
+33
 1a
 42
 04
@@ -3464,7 +3372,7 @@
 24
 21
 03
-67
+50
 1a
 20
 a2
@@ -3476,7 +3384,7 @@
 24
 3a
 03
-5b
+44
 da
 20
 00
@@ -3484,7 +3392,7 @@
 20
 40
 03
-6c
+55
 1c
 42
 7e
@@ -3540,11 +3448,11 @@
 20
 40
 03
-73
+5c
 20
 20
 03
-6d
+56
 da
 60
 4f
@@ -3552,7 +3460,7 @@
 da
 40
 03
-76
+5f
 20
 20
 42
@@ -3564,11 +3472,11 @@
 c0
 00
 83
-7a
+63
 c0
 01
 03
-9d
+86
 20
 60
 00
@@ -3580,7 +3488,7 @@
 24
 3a
 03
-89
+72
 70
 49
 e5
@@ -3608,7 +3516,7 @@
 20
 42
 83
-95
+7e
 da
 60
 4f
@@ -3616,7 +3524,7 @@
 20
 40
 03
-c0
+a9
 ef
 e1
 00
@@ -3636,7 +3544,7 @@
 20
 40
 03
-c8
+b1
 6f
 e0
 cf
@@ -3656,7 +3564,7 @@
 20
 42
 83
-95
+7e
 da
 60
 4f
@@ -3664,7 +3572,7 @@
 20
 40
 03
-c0
+a9
 ef
 e1
 00
@@ -3700,7 +3608,7 @@
 20
 40
 03
-c0
+a9
 58
 00
 06
@@ -3720,7 +3628,7 @@
 24
 3a
 03
-ac
+95
 70
 49
 e5
@@ -3748,7 +3656,7 @@
 20
 42
 83
-b8
+a1
 da
 60
 4f
@@ -3756,7 +3664,7 @@
 20
 40
 03
-c0
+a9
 ef
 e1
 00
@@ -3776,7 +3684,7 @@
 20
 40
 03
-c8
+b1
 6f
 e0
 cf
@@ -3796,7 +3704,7 @@
 20
 42
 83
-b8
+a1
 da
 60
 4f
@@ -3804,7 +3712,7 @@
 20
 40
 03
-c0
+a9
 ef
 e1
 00
@@ -3840,7 +3748,7 @@
 20
 40
 03
-c0
+a9
 58
 00
 0a
@@ -3899,7 +3807,7 @@
 00
 70
 4f
-ef
+f1
 01
 20
 60
@@ -3908,7 +3816,7 @@
 6f
 e0
 cf
-ef
+f1
 20
 7a
 00
@@ -3916,7 +3824,7 @@
 6f
 e0
 cf
-f1
+f3
 20
 7a
 00
@@ -3924,23 +3832,23 @@
 da
 60
 4f
-f5
+f7
 da
 40
 03
-d4
+bd
 20
 20
 42
 e0
 70
 4f
-f5
+f7
 05
 6f
 e0
 cf
-f6
+f8
 79
 40
 7e
@@ -3948,7 +3856,7 @@
 67
 e0
 cf
-f6
+f8
 c0
 00
 c3
@@ -3960,7 +3868,7 @@
 6f
 e0
 cf
-f0
+f2
 1f
 e0
 fe
@@ -3968,11 +3876,11 @@
 67
 e0
 cf
-f0
+f2
 68
 48
 cf
-f4
+f6
 98
 46
 7c
@@ -3984,7 +3892,7 @@
 6f
 e0
 cf
-ef
+f1
 20
 7a
 00
@@ -3992,14 +3900,14 @@
 20
 40
 03
-da
+c3
 24
 61
 00
 00
 70
 4f
-f0
+f2
 00
 70
 44
@@ -4016,43 +3924,43 @@
 20
 40
 04
-59
+42
 20
 40
 04
-3a
+23
 67
 e1
 4f
-ed
+ef
 da
 20
 4f
-e7
+e9
 20
 40
 03
-f2
+db
 6f
 e0
 c4
 0c
 c2
 80
-84
-12
+83
+fb
 c3
 00
-04
-16
+03
+ff
 70
 4f
-f2
+f4
 01
 20
 20
-04
-14
+03
+fd
 ef
 e4
 00
@@ -4111,8 +4019,8 @@
 00
 20
 21
-04
-0e
+03
+f7
 68
 49
 06
@@ -4123,12 +4031,12 @@
 00
 24
 21
-04
-10
+03
+f9
 20
 3a
-04
-10
+03
+f9
 1f
 ef
 a2
@@ -4160,14 +4068,14 @@
 67
 e0
 cf
-f3
+f5
 20
 60
 00
 00
 70
 4f
-f3
+f5
 64
 20
 60
@@ -4175,7 +4083,7 @@
 00
 70
 4f
-f3
+f5
 00
 20
 60
@@ -4191,7 +4099,7 @@
 27
 70
 4f
-f1
+f3
 01
 20
 60
@@ -4199,12 +4107,12 @@
 00
 70
 4f
-f1
+f3
 00
 6f
 e0
 cf
-f2
+f4
 20
 7a
 00
@@ -4215,7 +4123,7 @@
 25
 70
 4f
-f2
+f4
 00
 20
 60
@@ -4348,11 +4256,11 @@
 c0
 00
 84
-3e
+27
 c0
 01
 04
-45
+2e
 20
 60
 00
@@ -4384,7 +4292,7 @@
 20
 20
 04
-4b
+34
 58
 00
 03
@@ -4432,7 +4340,7 @@
 20
 40
 04
-2d
+16
 6f
 f0
 8a
@@ -4468,7 +4376,7 @@
 20
 40
 04
-50
+39
 20
 40
 6f
@@ -4496,7 +4404,7 @@
 20
 40
 04
-50
+39
 6f
 e0
 c4
@@ -4528,7 +4436,7 @@
 20
 40
 04
-72
+5b
 68
 59
 01
@@ -4572,13 +4480,13 @@
 c3
 02
 84
-72
+5b
 20
 60
 00
 00
-d1
-cd
+77
+e6
 aa
 55
 40
@@ -4805,21 +4713,21 @@
 55
 01
 00
-f5
+f7
 4f
 05
 aa
 55
 01
 00
-f4
+f6
 4f
 05
 aa
 55
 06
 00
-e7
+e9
 4f
 e4
 0c
@@ -5156,7 +5064,7 @@
 00
 aa
 55
-1c
+16
 00
 b8
 4f
@@ -5176,21 +5084,25 @@
 00
 32
 31
-30
-2f
 25
 24
 23
 22
 1d
 00
+aa
+55
+04
+00
+d0
+4f
 29
 00
 2a
 00
 aa
 55
-08
+0a
 00
 dc
 4f
@@ -5201,6 +5113,8 @@
 00
 2d
 2e
+2f
+30
 00
 aa
 55
@@ -5872,35 +5786,35 @@
 23
 00
 83
-00
-04
-10
-09
+a0
+0d
+f0
+0e
 87
-00
-04
-00
-03
+a0
+0d
+a0
+0e
 0a
 23
 00
-83
-00
-04
-20
-09
-87
 00
+a0
+0d
+f0
+0e
 04
-00
-03
+a0
+0d
+a0
+0e
 0a
 23
 00
 83
 00
 04
-30
+10
 09
 87
 00
@@ -5913,7 +5827,7 @@
 83
 00
 04
-50
+20
 09
 87
 00
@@ -6874,7 +6788,7 @@
 aa
 aa
 55
-d8
-8c
+5a
+93
+a7
 42
-fb
Index: output/ramcode.rom
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/output/ramcode.rom	(revision 5225)
+++ /1121s/branch/shutter/yc1089s_fouse_public/output/ramcode.rom	(working copy)
@@ -2,12 +2,12 @@
 c0000051
 c0010122
 c008812b
-c00a030a
+c00a02f3
 c00a81b8
 c00c01c6
 c00c8185
 c00d013d
-c012832c
+c0128315
 c013807c
 c05180c7
 c05280ff
@@ -17,16 +17,16 @@
 c05881d8
 c062001f
 c06281cd
-c06d02f3
-c06d841c
-c06e0459
-c06e843a
+c06d02dc
+c06d8405
+c06e0442
+c06e8423
 2020235a
 c0120055
 c01280d8
 c01300dd
-c01c8326
-c026832a
+c01c830f
+c0268313
 c17f8000
 2020235a
 20406b34
@@ -278,11 +278,11 @@
 dfe00003
 2020655a
 2040011f
-20400395
+2040037e
 da604fc4
 20206371
 2040011f
-204003b8
+204003a1
 da604fd2
 20206371
 704fd900
@@ -350,12 +350,12 @@
 58557474
 67f18968
 7089606e
-204002c5
-204002f0
+204002ae
+204002d9
 20400166
 7041480c
 20406f4e
-202002f2
+202002db
 20758000
 37d98200
 6fe0c11c
@@ -473,25 +473,26 @@
 20407396
 20758000
 204042a3
-204003cb
+204003b4
+70409400
 204001d0
 20406459
 58000001
 67e144f6
 7040a60a
-58000242
+58000241
 67e143db
-5800021f
+5800021e
 67e143dd
-58000234
+58000233
 67e143df
 580062d3
 67e143d3
-580001fb
+580001fc
 67e143d5
 58006329
 67e143d7
-58000210
+58000211
 67e143e3
 58006505
 67e14524
@@ -507,7 +508,7 @@
 202062bd
 20406f35
 7044ecff
-20400200
+20400201
 2040701b
 2020739a
 6fe0c6ce
@@ -518,34 +519,32 @@
 efe08011
 6848c6cf
 98467c00
-2022820b
+2022820c
 1fe20400
-2040020e
+2040020f
 1a20a201
-c2000205
+c2000206
 20600000
 79200407
 20206edd
-204003e0
-204003cd
-204002bb
-204002c0
+204003c9
+204003b6
 2040676c
 2040675a
-20400218
+20400217
 202064d9
 da604518
-da40021b
+da40021a
 202042e7
 70451c02
 20404325
 2040634e
 2020639e
 1a627e00
-c020022b
-c0188229
-c00a8226
-c00a0225
+c020022a
+c0188228
+c00a8225
+c00a0224
 202064e0
 202064f4
 6fe14512
@@ -558,25 +557,25 @@
 6fe4450a
 207a0000
 20406730
-243a023f
+243a023e
 6fe44f02
 67e442d3
 20202e93
 6fe14398
-c0120237
+c0120236
 20600000
 204078ad
 7044f101
 20406730
 2040432b
-243a023f
+243a023e
 6fe44f02
 67e442d3
 20202e93
 6fe44fb0
 67e442d3
 20202e93
-2040024d
+2040024c
 d8e00009
 20407cef
 247a0000
@@ -585,10 +584,10 @@
 20407ce1
 78547c00
 2040701b
-20400267
-20200355
+20400266
+2020033e
 6fe144e9
-c2848252
+c2848251
 d8a045da
 df200023
 20207ca1
@@ -600,7 +599,7 @@
 1c427e00
 98460400
 20628000
-2421025e
+2421025d
 6fe0c9e5
 98467c00
 20610000
@@ -628,7 +627,7 @@
 67e1068c
 18e27e00
 67e1067a
-20400284
+20400283
 6fe1068c
 1fe22600
 6fe1067a
@@ -640,7 +639,7 @@
 1fe0a60a
 6fe10678
 1fe27200
-c2000270
+c200026f
 20600000
 1a60a405
 efe20012
@@ -651,43 +650,31 @@
 24417806
 580003e8
 98467c00
-2020028e
+2020028d
 1a608c04
 efe08006
-20200291
+20200290
 2040656b
 20406561
 20216500
-204002b3
+204002a6
 18e27e00
-c003029b
-c003829d
-c004029f
-c00482a6
+c003029a
+c003829c
+c004029e
+c00482a5
 20206558
 da604fb8
 20206371
 da604fc6
 20206371
-204002a1
+204002a0
 20206371
 da604fdc
 20406730
 207a0000
 da604fe1
 20600000
-204002a8
-20206371
-20406730
-c00002ab
-c00082af
-da604a5d
-20406371
-704ff70b
-20600000
-da604b84
-20406371
-704ff80b
 20600000
 da604a30
 7049e55a
@@ -697,16 +684,6 @@
 18e27e00
 7049e514
 20600000
-da604ff7
-da4002be
-202042e0
-da604bea
-20206371
-da604ff8
-da4002c3
-202042e0
-da604bf4
-20206371
 20758000
 20402160
 d8400027
@@ -719,7 +696,7 @@
 708ac200
 708ac300
 d8e00006
-204002e2
+204002cb
 2a2ffe0d
 2040211d
 2a4ffe0d
@@ -727,14 +704,14 @@
 d8e00005
 2040211c
 2040211e
-204002e2
+204002cb
 d8a08ac2
 1a31fe00
 20402117
 1a51fe00
 20402117
 18e08fff
-202102d7
+202102c0
 2020214f
 2000003c
 58000f00
@@ -760,7 +737,7 @@
 6fe0c409
 67f080cd
 20000bb8
-20400303
+204002ec
 708a08c1
 6a40c419
 df200008
@@ -771,7 +748,7 @@
 20600000
 7080cc03
 6ff08129
-c3028304
+c30282ed
 68590164
 6049440a
 7080cc00
@@ -780,7 +757,7 @@
 708a8d12
 708a8e0a
 6fe0c099
-c0080323
+c008030c
 58005762
 67f10907
 70890103
@@ -791,7 +768,7 @@
 708a8d44
 708a8e0a
 6fe0c099
-c0080320
+c0080309
 58002bb1
 67f10907
 c6978000
@@ -800,10 +777,10 @@
 20600000
 58004189
 67f10907
-2020031c
+20200305
 58008312
 67f10907
-20200311
+202002fa
 6fe0c334
 c1000000
 c001b04a
@@ -815,7 +792,7 @@
 6fe240ad
 9840fe00
 67e240ad
-2040033d
+20400326
 6fe0c0cb
 79207e04
 204023e1
@@ -843,12 +820,12 @@
 efe08011
 e8408013
 98467c00
-20228350
+20228339
 e7e08013
 37d98200
 1a20a201
 1a60a601
-c200034a
+c2000333
 1a420400
 20600000
 da200000
@@ -860,12 +837,12 @@
 1a427e00
 18408440
 98467c00
-24210367
+24210350
 1a20a201
 1a217e0f
-243a035b
+243a0344
 da200000
-2040036c
+20400355
 1c427e00
 67e24fd5
 20600000
@@ -879,38 +856,38 @@
 207a0000
 1fe0ffff
 67e0cfd4
-20400373
-2020036d
+2040035c
+20200356
 da604fd9
-da400376
+da40035f
 202042e0
 6fe0cfda
-c000837a
-c001039d
+c0008363
+c0010386
 20600000
 20406730
-243a0389
+243a0372
 7049e514
 704fd901
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c5a
-20428395
+2042837e
 da604fc2
-204003c0
+204003a9
 efe1003f
 1fe0fe0a
 e7e10011
 20206371
-204003c8
+204003b1
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c5a
-20428395
+2042837e
 da604fc2
-204003c0
+204003a9
 efe1003f
 1fe0fe0a
 e7e10011
@@ -919,33 +896,33 @@
 da604fc4
 20406371
 da604fc2
-204003c0
+204003a9
 58000650
 e7e10011
 20600000
 20406730
-243a03ac
+243a0395
 7049e514
 704fd901
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c5a
-204283b8
+204283a1
 da604fd0
-204003c0
+204003a9
 efe1003f
 1fe0fff6
 e7e10011
 20206371
-204003c8
+204003b1
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c3c
-204283b8
+204283a1
 da604fd0
-204003c0
+204003a9
 efe1003f
 1fe0fff6
 e7e10011
@@ -954,7 +931,7 @@
 da604fd2
 20406371
 da604fd0
-204003c0
+204003a9
 58000a00
 e7e10011
 20600000
@@ -969,45 +946,45 @@
 7049e501
 704fd902
 20600000
-704fef01
+704ff101
 20600000
-6fe0cfef
-207a0000
 6fe0cff1
 207a0000
-da604ff5
-da4003d4
+6fe0cff3
+207a0000
+da604ff7
+da4003bd
 202042e0
-704ff505
-6fe0cff6
+704ff705
+6fe0cff8
 79407e00
-67e0cff6
+67e0cff8
 c000c323
 20204325
-6fe0cff0
+6fe0cff2
 1fe0fe01
-67e0cff0
-6848cff4
+67e0cff2
+6848cff6
 98467c00
 20600000
-6fe0cfef
+6fe0cff1
 207a0000
-204003da
+204003c3
 24610000
-704ff000
+704ff200
 70440701
 20406ff3
 20406feb
-20400459
-2040043a
-67e14fed
-da204fe7
-204003f2
+20400442
+20400423
+67e14fef
+da204fe9
+204003db
 6fe0c40c
-c2808412
-c3000416
-704ff201
-20200414
+c28083fb
+c30003ff
+704ff401
+202003fd
 efe40011
 67e40670
 20406ff3
@@ -1022,11 +999,11 @@
 6fe10676
 68490670
 98467c00
-2021040e
+202103f7
 68490672
 98467e00
-24210410
-203a0410
+242103f9
+203a03f9
 1fefa264
 6fe10670
 68490672
@@ -1034,21 +1011,21 @@
 1a227e00
 9846fc00
 20407d5f
-67e0cff3
+67e0cff5
 20600000
-704ff364
+704ff564
 20600000
-704ff300
+704ff500
 20600000
 20404325
 20204327
-704ff101
+704ff301
 20600000
-704ff100
-6fe0cff2
+704ff300
+6fe0cff4
 207a0000
 20404325
-704ff200
+704ff400
 20600000
 6fe401fd
 203a6f79
@@ -1081,8 +1058,8 @@
 67f08a0a
 20600000
 6fe0c407
-c000843e
-c0010445
+c0008427
+c001042e
 20600000
 580003e8
 67e14405
@@ -1090,7 +1067,7 @@
 6fe14154
 da600e10
 20406fc0
-2020044b
+20200434
 580003e8
 67e14405
 6849414e
@@ -1102,7 +1079,7 @@
 68494158
 9846fc00
 20207d5f
-2040042d
+20400416
 6ff08a09
 793ffe07
 67f08a09
@@ -1111,14 +1088,14 @@
 708a0d61
 708a0b00
 20600000
-20400450
+20400439
 20406f90
 6fe0c409
 67f080cd
 20406f97
 708a0d60
 7080cd00
-20400450
+20400439
 6fe0c409
 67f080cd
 708a0b50
@@ -1126,7 +1103,7 @@
 df00000b
 6de1440a
 7080cc03
-20400472
+2040045b
 68590164
 60494158
 20406f9c
@@ -1137,5 +1114,5 @@
 7080cc00
 20600000
 6ff08129
-c3028472
+c302845b
 20600000
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/output/sched.rom	(revision 5225)
+++ /1121s/branch/shutter/yc1089s_fouse_public/output/sched.rom	(working copy)
@@ -326,12 +326,14 @@
 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:32 31 30 2f 25 24 23 22 1d 00
+mem_fouse_down_press:32 31 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 2b 2c 00
-mem_shutter_mode_step_ios:2d 2e 00
+
+mem_shutter_mode_step_ios_release:
+2d 2e 2f 30 00
 
 mem_shutter_dy_step_mode_android:1b 1c 1b 1c 00
 ################################### fouse config  end ######################################
@@ -370,15 +372,6 @@
 0a 23 00 83 f4 07 80 09 04 f4 07 80 09 #11
 0a 23 00 00 f4 07 40 0a 04 f4 07 40 0a #12
 #right and left
-# 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 08 04 40 00 40 04 #13
 0a 23 00 83 80 02 80 08 04 80 02 40 04 #14
 0a 23 00 83 40 04 80 08 04 40 05 40 04 #15
@@ -391,17 +384,6 @@
 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 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
@@ -414,38 +396,28 @@
 0a 23 00 00 00 04 e0 08 04 00 04 00 03 #26
 
 #fouse long press
-# 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 80 0d f1 0d 87 80 0c f1 0c #2b
 0a 23 00 00 80 0d f1 0d 04 80 0c f1 0c #2c
-#ios mode step
-#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 87 80 0e f0 0e #2d
+#ios mode step
+0a 23 00 83 b0 0e 45 0e 87 80 0e f0 0e #2d   大部分苹果手机
 0a 23 00 00 b0 0e 45 0e 04 80 0e f0 0e #2e
 
+0a 23 00 83 a0 0d f0 0e 87 a0 0d a0 0e #2f  IOS26触摸位置 第一个坐标为promax，第二个坐标位小屏幕
+0a 23 00 00 a0 0d f0 0e 04 a0 0d a0 0e #30
+
+
 #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
+0a 23 00 83 00 04 10 09 87 00 04 00 03 #31
+0a 23 00 83 00 04 20 09 87 00 04 00 03 #32
+
+
 
 #photo touch
 0a 23 00 83 f0 07 05 0e 04 f0 07 05 0e #33
Index: program/patch.prog
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/program/patch.prog	(revision 5225)
+++ /1121s/branch/shutter/yc1089s_fouse_public/program/patch.prog	(working copy)
@@ -269,6 +269,7 @@
 	branch shutter_dy_over_clear,positive
 	copy queue,pdata
 	store 1,mem_last_press_key_value
+	//beq SHUTTER_FUN2_KEY_NUM,p_shutter_fun2_key_press
 	rtn
 
 p_shutter_dy_key_value_filter:
@@ -325,7 +326,7 @@
 
 p_shutter_dy_not_iphone_read_conf:
 	branch p_shutter_dy_remote_not_iphone
-	
+
 p_shutter_dy_remote_not_iphone:
 	jam 1,mem_shutter_back_count
 	jam 0,mem_iphone_flag
@@ -613,7 +614,8 @@
 	call app_param_init
 ifdef ADC_1121SB
 	call p_shutter_adc_config_init
-endif	
+endif
+	jam 0,mem_lpm_mode
 	call p_shutter_dy_key_conf
 	call shutter_dy_adv_conf
 	setarg 0x0001
@@ -657,10 +659,22 @@
 	fetch 8,mem_ble_shutter_interval_min_new
 	store 8,mem_ble_shutter_interval_min
 
-	
+
 	// call shutter_dy_iphone_every_move_max_set
 	branch shutter_power_switch
 
+
+// p_shutter_fun2_key_press:
+// 	call p_shutter_mode_step_press_ptr
+// 	branch push_buffer_in_queue
+
+// p_shutter_mode_step_press_ptr:
+// 	arg mem_shutter_mode_step_android,regc
+// 	call shutter_dy_check_iphone
+// 	rtn blank
+// 	arg mem_shutter_mode_step_ios_press,regc
+// 	rtn
+
 p_shutter_le_before_hibernate:
 	call gpio_set_before_lpm
 	jam UI_BUTTON_GPIO_DISABLE,mem_ui_button_gpio
@@ -695,8 +709,6 @@
 	call p_shutter_adc_read_timer
 	call p_shutter_low_volatage_led_timer
 endif
-	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
@@ -713,26 +725,6 @@
 	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_clear:
-// 	jam 0,mem_shutter_photo_click_count
-// 	jam 0,mem_shutter_photo_time
-// 	rtn
-
 p_shutter_dy_process_bb_event:
 	copy regc,pdata
 	beq BT_EVT_LE_PARSE_CONN_PAPA_UPDATE_RSP,p_ble_shutter_process_parse_connect_parameter_update_response
@@ -908,28 +900,11 @@
 	arg mem_shutter_mode_step_android,regc
 	call shutter_dy_check_iphone
 	rtn blank
-	arg mem_shutter_mode_step_ios,regc
+	arg mem_shutter_mode_step_ios_release,regc
+	//arg mem_key6_release_new_i,regc
 	rtn
 
 p_shutter_fun3_key_release:
- 	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:
@@ -943,24 +918,6 @@
 	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
Index: sched/shutter_dy.dat
===================================================================
--- /1121s/branch/shutter/yc1089s_fouse_public/sched/shutter_dy.dat	(revision 5225)
+++ /1121s/branch/shutter/yc1089s_fouse_public/sched/shutter_dy.dat	(working copy)
@@ -259,12 +259,14 @@
 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:32 31 30 2f 25 24 23 22 1d 00
+mem_fouse_down_press:32 31 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 2b 2c 00
-mem_shutter_mode_step_ios:2d 2e 00
+
+mem_shutter_mode_step_ios_release:
+2d 2e 2f 30 00
 
 mem_shutter_dy_step_mode_android:1b 1c 1b 1c 00
 ################################### fouse config  end ######################################
@@ -303,15 +305,6 @@
 0a 23 00 83 f4 07 80 09 04 f4 07 80 09 #11
 0a 23 00 00 f4 07 40 0a 04 f4 07 40 0a #12
 #right and left
-# 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 08 04 40 00 40 04 #13
 0a 23 00 83 80 02 80 08 04 80 02 40 04 #14
 0a 23 00 83 40 04 80 08 04 40 05 40 04 #15
@@ -324,17 +317,6 @@
 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 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
@@ -347,38 +329,28 @@
 0a 23 00 00 00 04 e0 08 04 00 04 00 03 #26
 
 #fouse long press
-# 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 80 0d f1 0d 87 80 0c f1 0c #2b
 0a 23 00 00 80 0d f1 0d 04 80 0c f1 0c #2c
-#ios mode step
-#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 87 80 0e f0 0e #2d
+#ios mode step
+0a 23 00 83 b0 0e 45 0e 87 80 0e f0 0e #2d   大部分苹果手机
 0a 23 00 00 b0 0e 45 0e 04 80 0e f0 0e #2e
 
+0a 23 00 83 a0 0d f0 0e 87 a0 0d a0 0e #2f  IOS26触摸位置 第一个坐标为promax，第二个坐标位小屏幕
+0a 23 00 00 a0 0d f0 0e 04 a0 0d a0 0e #30
+
+
 #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
+0a 23 00 83 00 04 10 09 87 00 04 00 03 #31
+0a 23 00 83 00 04 20 09 87 00 04 00 03 #32
+
+
 
 #photo touch
 0a 23 00 83 f0 07 05 0e 04 f0 07 05 0e #33