Index: format/app_shutter_dy.format
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/format/app_shutter_dy.format	(revision 5799)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/format/app_shutter_dy.format	(working copy)
@@ -316,3 +316,12 @@
 1 FOUSEUP
 2 FOUSEDOWN
 )
+
+amemalloc mem_dy_key0_press(
+1 mem_shutter_fun_press_time
+1 mem_shutter_fun_press_count
+1 mem_shutter_fun1_press_time
+1 mem_shutter_fun1_press_count
+
+)
+
Index: output/otp.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/output/otp.dat	(revision 5800)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/output/otp.dat	(working copy)
@@ -11,7 +11,7 @@
 00
 aa
 55
-16
+b6
 12
 c2
 84
@@ -32,7 +32,7 @@
 c0
 0a
 03
-03
+2b
 c0
 0a
 81
@@ -52,7 +52,7 @@
 c0
 12
 83
-25
+4d
 c0
 13
 80
@@ -80,7 +80,7 @@
 c0
 55
 84
-7a
+a2
 c0
 58
 81
@@ -95,20 +95,20 @@
 cd
 c0
 6d
-02
-ec
+03
+14
 c0
 6d
 84
-21
+49
 c0
 6e
 04
-5e
+86
 c0
 6e
 84
-3f
+67
 20
 20
 23
@@ -128,11 +128,11 @@
 c0
 1c
 83
-1f
+47
 c0
 26
 83
-23
+4b
 c1
 7f
 80
@@ -600,7 +600,7 @@
 20
 20
 03
-7e
+a6
 70
 4f
 da
@@ -608,7 +608,7 @@
 20
 20
 03
-a0
+c8
 20
 60
 00
@@ -1136,7 +1136,7 @@
 20
 40
 03
-98
+c0
 da
 60
 4f
@@ -1152,7 +1152,7 @@
 20
 40
 03
-ba
+e2
 da
 60
 4f
@@ -1424,11 +1424,11 @@
 20
 40
 02
-be
+e6
 20
 40
-02
-e9
+03
+11
 20
 40
 01
@@ -1443,8 +1443,8 @@
 4e
 20
 20
-02
-eb
+03
+13
 20
 75
 80
@@ -1916,7 +1916,7 @@
 20
 40
 03
-d0
+f8
 20
 40
 01
@@ -1940,7 +1940,7 @@
 58
 00
 02
-4b
+63
 67
 e1
 43
@@ -1948,7 +1948,7 @@
 58
 00
 02
-28
+40
 67
 e1
 43
@@ -1956,7 +1956,7 @@
 58
 00
 02
-3d
+55
 67
 e1
 43
@@ -2127,16 +2127,24 @@
 dd
 20
 40
-03
-e5
+04
+0d
 20
 40
 03
-d2
+fa
 20
 40
 02
-17
+19
+20
+40
+02
+24
+20
+40
+02
+2f
 20
 40
 67
@@ -2148,7 +2156,7 @@
 20
 40
 02
-21
+39
 20
 20
 64
@@ -2156,11 +2164,99 @@
 da
 60
 4f
+14
+da
+40
+02
+1c
+20
+20
+42
+e0
+6f
+e0
+cf
+15
+70
+4f
+15
+00
+c0
+00
+82
+21
+c0
+01
+02
+23
+20
+60
+00
+00
+da
+60
+4f
+b8
+20
+20
+63
+71
+20
+20
+00
+91
+da
+60
+4f
+16
+da
+40
+02
+27
+20
+20
+42
+e0
+6f
+e0
+cf
+17
+70
+4f
+17
+00
+c0
+00
+82
+2c
+c0
+01
+02
+2e
+20
+60
+00
+00
+da
+60
+4f
+c6
+20
+20
+63
+71
+20
+20
+00
+93
+da
+60
+4f
 f9
 da
 40
 02
-1a
+32
 20
 20
 42
@@ -2176,11 +2272,11 @@
 c0
 00
 82
-1f
+37
 c0
 01
 02
-20
+38
 20
 60
 00
@@ -2192,7 +2288,7 @@
 20
 20
 02
-ae
+d6
 da
 60
 45
@@ -2200,7 +2296,7 @@
 da
 40
 02
-24
+3c
 20
 20
 42
@@ -2228,19 +2324,19 @@
 c0
 20
 02
-34
+4c
 c0
 18
 82
-32
+4a
 c0
 0a
 82
-2f
+47
 c0
 0a
 02
-2e
+46
 20
 20
 64
@@ -2292,7 +2388,7 @@
 24
 3a
 02
-48
+60
 6f
 e4
 4f
@@ -2312,7 +2408,7 @@
 c0
 12
 02
-40
+58
 20
 60
 00
@@ -2336,7 +2432,7 @@
 24
 3a
 02
-48
+60
 6f
 e4
 4f
@@ -2364,11 +2460,11 @@
 20
 40
 03
-4e
+76
 20
 40
 02
-56
+6e
 d8
 e0
 00
@@ -2404,7 +2500,7 @@
 20
 20
 02
-70
+88
 6f
 e1
 44
@@ -2412,7 +2508,7 @@
 c2
 84
 82
-5b
+73
 d8
 a0
 45
@@ -2460,7 +2556,7 @@
 24
 21
 02
-67
+7f
 6f
 e0
 c9
@@ -2572,7 +2668,7 @@
 20
 40
 02
-8d
+a5
 6f
 e1
 06
@@ -2620,7 +2716,7 @@
 c2
 00
 02
-79
+91
 20
 60
 00
@@ -2664,7 +2760,7 @@
 20
 20
 02
-97
+af
 1a
 60
 8c
@@ -2676,7 +2772,7 @@
 20
 20
 02
-9a
+b2
 20
 40
 65
@@ -2692,7 +2788,7 @@
 20
 40
 02
-b6
+de
 18
 e2
 7e
@@ -2700,23 +2796,23 @@
 c0
 01
 82
-a5
+c1
 c0
 03
 02
-aa
+c8
 c0
 03
 82
-ac
+cf
 c0
 04
 02
-ae
+d6
 c0
 04
 82
-b5
+dd
 20
 20
 65
@@ -2724,6 +2820,30 @@
 6f
 e0
 cf
+da
+c0
+00
+81
+17
+c0
+01
+01
+1b
+20
+60
+00
+00
+6f
+e0
+cf
+da
+24
+3a
+02
+bd
+6f
+e0
+cf
 fa
 1f
 e0
@@ -2741,26 +2861,66 @@
 60
 00
 00
+6f
+e0
+cf
 da
-60
+24
+3a
+02
+bd
+6f
+e0
+cf
+15
+1f
+e0
+fe
+01
+67
+e0
+cf
+15
+70
 4f
-b8
-20
+14
+04
 20
-63
-71
-da
 60
+00
+00
+6f
+e0
+cf
+da
+24
+3a
+02
+bd
+6f
+e0
+cf
+17
+1f
+e0
+fe
+01
+67
+e0
+cf
+17
+70
 4f
-c6
-20
+16
+04
 20
-63
-71
+60
+00
+00
 20
 40
 02
-b0
+d8
 20
 20
 63
@@ -2871,8 +3031,8 @@
 06
 20
 40
-02
-db
+03
+03
 2a
 2f
 fe
@@ -2903,8 +3063,8 @@
 1e
 20
 40
-02
-db
+03
+03
 d8
 a0
 8a
@@ -2932,7 +3092,7 @@
 20
 21
 02
-d0
+f8
 20
 20
 21
@@ -3035,8 +3195,8 @@
 b8
 20
 40
-02
-fc
+03
+24
 70
 8a
 08
@@ -3079,8 +3239,8 @@
 29
 c3
 02
-82
-fd
+83
+25
 68
 59
 01
@@ -3116,7 +3276,7 @@
 c0
 08
 03
-1c
+44
 58
 00
 57
@@ -3160,7 +3320,7 @@
 c0
 08
 03
-19
+41
 58
 00
 2b
@@ -3196,7 +3356,7 @@
 20
 20
 03
-15
+3d
 58
 00
 83
@@ -3208,7 +3368,7 @@
 20
 20
 03
-0a
+32
 6f
 e0
 c3
@@ -3256,7 +3416,7 @@
 20
 40
 03
-36
+5e
 6f
 e0
 c0
@@ -3368,7 +3528,7 @@
 20
 22
 83
-49
+71
 e7
 e0
 80
@@ -3388,7 +3548,7 @@
 c2
 00
 03
-43
+6b
 1a
 42
 04
@@ -3428,7 +3588,7 @@
 24
 3a
 03
-70
+98
 1a
 42
 7e
@@ -3444,7 +3604,7 @@
 24
 21
 03
-62
+8a
 1a
 20
 a2
@@ -3456,7 +3616,7 @@
 24
 3a
 03
-54
+7c
 da
 20
 00
@@ -3464,7 +3624,7 @@
 20
 40
 03
-69
+91
 1c
 42
 7e
@@ -3484,7 +3644,7 @@
 24
 3a
 03
-73
+9b
 1a
 22
 7e
@@ -3528,11 +3688,11 @@
 20
 40
 03
-77
+9f
 20
 20
 03
-6a
+92
 1a
 42
 7e
@@ -3544,7 +3704,7 @@
 20
 20
 03
-58
+80
 1a
 22
 7e
@@ -3560,7 +3720,7 @@
 20
 20
 03
-67
+8f
 da
 60
 4f
@@ -3568,7 +3728,7 @@
 da
 40
 03
-7a
+a2
 20
 20
 42
@@ -3580,11 +3740,11 @@
 c0
 00
 83
-7e
+a6
 c0
 01
 03
-a0
+c8
 20
 60
 00
@@ -3596,11 +3756,11 @@
 24
 3a
 03
-8c
+b4
 20
 40
 03
-ca
+f2
 6f
 e0
 cf
@@ -3620,7 +3780,7 @@
 20
 22
 83
-98
+c0
 da
 60
 4f
@@ -3628,7 +3788,7 @@
 20
 40
 03
-c2
+ea
 ef
 e1
 00
@@ -3648,7 +3808,7 @@
 20
 40
 03
-cd
+f5
 6f
 e0
 cf
@@ -3668,7 +3828,7 @@
 20
 42
 83
-98
+c0
 da
 60
 4f
@@ -3676,7 +3836,7 @@
 20
 40
 03
-c2
+ea
 ef
 e1
 00
@@ -3712,7 +3872,7 @@
 20
 40
 03
-c2
+ea
 58
 00
 06
@@ -3732,11 +3892,11 @@
 24
 3a
 03
-ae
+d6
 20
 40
 03
-ca
+f2
 6f
 e0
 cf
@@ -3756,7 +3916,7 @@
 20
 22
 83
-ba
+e2
 da
 60
 4f
@@ -3764,7 +3924,7 @@
 20
 40
 03
-c2
+ea
 ef
 e1
 00
@@ -3784,7 +3944,7 @@
 20
 40
 03
-cd
+f5
 6f
 e0
 cf
@@ -3804,7 +3964,7 @@
 20
 42
 83
-ba
+e2
 da
 60
 4f
@@ -3812,7 +3972,7 @@
 20
 40
 03
-c2
+ea
 ef
 e1
 00
@@ -3848,7 +4008,7 @@
 20
 40
 03
-c2
+ea
 58
 00
 07
@@ -3947,8 +4107,8 @@
 f7
 da
 40
-03
-d9
+04
+01
 20
 20
 42
@@ -4011,8 +4171,8 @@
 00
 20
 40
-03
-df
+04
+07
 24
 61
 00
@@ -4036,11 +4196,11 @@
 20
 40
 04
-5e
+86
 20
 40
 04
-3f
+67
 67
 e1
 4f
@@ -4051,8 +4211,8 @@
 e9
 20
 40
-03
-f7
+04
+1f
 6f
 e0
 c4
@@ -4060,11 +4220,11 @@
 c2
 80
 84
-17
+3f
 c3
 00
 04
-1b
+43
 70
 4f
 f4
@@ -4072,7 +4232,7 @@
 20
 20
 04
-19
+41
 ef
 e4
 00
@@ -4132,7 +4292,7 @@
 20
 21
 04
-13
+3b
 68
 49
 06
@@ -4144,11 +4304,11 @@
 24
 21
 04
-15
+3d
 20
 3a
 04
-15
+3d
 1f
 ef
 a2
@@ -4368,11 +4528,11 @@
 c0
 00
 84
-43
+6b
 c0
 01
 04
-4a
+72
 20
 60
 00
@@ -4404,7 +4564,7 @@
 20
 20
 04
-50
+78
 58
 00
 03
@@ -4452,7 +4612,7 @@
 20
 40
 04
-32
+5a
 6f
 f0
 8a
@@ -4488,7 +4648,7 @@
 20
 40
 04
-55
+7d
 20
 40
 6f
@@ -4516,7 +4676,7 @@
 20
 40
 04
-55
+7d
 6f
 e0
 c4
@@ -4548,7 +4708,7 @@
 20
 40
 04
-77
+9f
 68
 59
 01
@@ -4592,7 +4752,7 @@
 c3
 02
 84
-77
+9f
 20
 60
 00
@@ -4616,7 +4776,7 @@
 20
 20
 04
-7f
+a7
 58
 00
 05
@@ -4641,8 +4801,8 @@
 60
 00
 00
-cb
-fd
+fa
+ca
 aa
 55
 40
@@ -4733,7 +4893,7 @@
 00
 db
 42
-0d
+0c
 21
 21
 98
@@ -6888,7 +7048,7 @@
 aa
 aa
 55
-72
+71
 91
-54
-75
+11
+9b
Index: output/ramcode.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/output/ramcode.rom	(revision 5799)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/output/ramcode.rom	(working copy)
@@ -2,32 +2,32 @@
 c0000052
 c0010122
 c008812b
-c00a0303
+c00a032b
 c00a81b8
 c00c01c6
 c00c8185
 c00d013d
-c0128325
+c012834d
 c013807d
 c05180c1
 c05280ff
 c0530088
 c0538097
 c05500e9
-c055847a
+c05584a2
 c05881d8
 c0620020
 c06281cd
-c06d02ec
-c06d8421
-c06e045e
-c06e843f
+c06d0314
+c06d8449
+c06e0486
+c06e8467
 2020235a
 c0120056
 c01280d2
 c01300d7
-c01c831f
-c0268323
+c01c8347
+c026834b
 c17f8000
 2020235a
 20406b34
@@ -144,9 +144,9 @@
 c0048096
 202065a2
 704fda01
-2020037e
+202003a6
 704fda02
-202003a0
+202003c8
 20600000
 20600000
 6fe0cec7
@@ -278,11 +278,11 @@
 dfe00003
 2020655a
 2040011f
-20400398
+204003c0
 da604fc4
 20206371
 2040011f
-204003ba
+204003e2
 da604fd2
 20206371
 704fd900
@@ -350,12 +350,12 @@
 58557474
 67f18968
 7089606e
-204002be
-204002e9
+204002e6
+20400311
 20400166
 7041480c
 20406f4e
-202002eb
+20200313
 20758000
 37d98200
 6fe0c11c
@@ -473,17 +473,17 @@
 20407396
 20758000
 204042a3
-204003d0
+204003f8
 204001d0
 20406459
 58000001
 67e144f6
 7040a60a
-5800024b
+58000263
 67e143db
-58000228
+58000240
 67e143dd
-5800023d
+58000255
 67e143df
 580062d3
 67e143d3
@@ -526,35 +526,59 @@
 20600000
 79200407
 20206edd
-204003e5
-204003d2
-20400217
+2040040d
+204003fa
+20400219
+20400224
+2040022f
 2040676c
 2040675a
-20400221
+20400239
 202064d9
+da604f14
+da40021c
+202042e0
+6fe0cf15
+704f1500
+c0008221
+c0010223
+20600000
+da604fb8
+20206371
+20200091
+da604f16
+da400227
+202042e0
+6fe0cf17
+704f1700
+c000822c
+c001022e
+20600000
+da604fc6
+20206371
+20200093
 da604ff9
-da40021a
+da400232
 202042e0
 6fe0cffa
 704ffa00
-c000821f
-c0010220
+c0008237
+c0010238
 20600000
 20206740
-202002ae
+202002d6
 da604518
-da400224
+da40023c
 202042e7
 70451c02
 20404325
 2040634e
 2020639e
 1a627e00
-c0200234
-c0188232
-c00a822f
-c00a022e
+c020024c
+c018824a
+c00a8247
+c00a0246
 202064e0
 202064f4
 6fe14512
@@ -567,26 +591,26 @@
 6fe4450a
 207a0000
 20406730
-243a0248
+243a0260
 6fe44f02
 67e442d3
 20202e93
 6fe14398
-c0120240
+c0120258
 20600000
 204078ad
 7044f101
 20406730
 2040432b
-243a0248
+243a0260
 6fe44f02
 67e442d3
 20202e93
 6fe44fb0
 67e442d3
 20202e93
-2040034e
-20400256
+20400376
+2040026e
 d8e00009
 20407cef
 247a0000
@@ -595,9 +619,9 @@
 20407ce1
 78547c00
 2040701b
-20200270
+20200288
 6fe144e9
-c284825b
+c2848273
 d8a045da
 df200023
 20207ca1
@@ -609,7 +633,7 @@
 1c427e00
 98460400
 20628000
-24210267
+2421027f
 6fe0c9e5
 98467c00
 20610000
@@ -637,7 +661,7 @@
 67e1068c
 18e27e00
 67e1067a
-2040028d
+204002a5
 6fe1068c
 1fe22600
 6fe1067a
@@ -649,7 +673,7 @@
 1fe0a60a
 6fe10678
 1fe27200
-c2000279
+c2000291
 20600000
 1a60a405
 efe20012
@@ -660,31 +684,47 @@
 24417806
 580003e8
 98467c00
-20200297
+202002af
 1a608c04
 efe08006
-2020029a
+202002b2
 2040656b
 20406561
 20216500
-204002b6
+204002de
 18e27e00
-c00182a5
-c00302aa
-c00382ac
-c00402ae
-c00482b5
+c00182c1
+c00302c8
+c00382cf
+c00402d6
+c00482dd
 20206558
+6fe0cfda
+c0008117
+c001011b
+20600000
+6fe0cfda
+243a02bd
 6fe0cffa
 1fe0fe01
 67e0cffa
 704ff904
 20600000
-da604fb8
-20206371
-da604fc6
-20206371
-204002b0
+6fe0cfda
+243a02bd
+6fe0cf15
+1fe0fe01
+67e0cf15
+704f1404
+20600000
+6fe0cfda
+243a02bd
+6fe0cf17
+1fe0fe01
+67e0cf17
+704f1604
+20600000
+204002d8
 20206371
 da604fdc
 20406730
@@ -712,7 +752,7 @@
 708ac200
 708ac300
 d8e00006
-204002db
+20400303
 2a2ffe0d
 2040211d
 2a4ffe0d
@@ -720,14 +760,14 @@
 d8e00005
 2040211c
 2040211e
-204002db
+20400303
 d8a08ac2
 1a31fe00
 20402117
 1a51fe00
 20402117
 18e08fff
-202102d0
+202102f8
 2020214f
 2000003c
 58000f00
@@ -753,7 +793,7 @@
 6fe0c409
 67f080cd
 20000bb8
-204002fc
+20400324
 708a08c1
 6a40c419
 df200008
@@ -764,7 +804,7 @@
 20600000
 7080cc03
 6ff08129
-c30282fd
+c3028325
 68590164
 6049440a
 7080cc00
@@ -773,7 +813,7 @@
 708a8d12
 708a8e0a
 6fe0c099
-c008031c
+c0080344
 58005762
 67f10907
 70890103
@@ -784,7 +824,7 @@
 708a8d44
 708a8e0a
 6fe0c099
-c0080319
+c0080341
 58002bb1
 67f10907
 c6978000
@@ -793,10 +833,10 @@
 20600000
 58004189
 67f10907
-20200315
+2020033d
 58008312
 67f10907
-2020030a
+20200332
 6fe0c334
 c1000000
 c001b04a
@@ -808,7 +848,7 @@
 6fe240ad
 9840fe00
 67e240ad
-20400336
+2040035e
 6fe0c0cb
 79207e04
 204023e1
@@ -836,12 +876,12 @@
 efe08011
 e8408013
 98467c00
-20228349
+20228371
 e7e08013
 37d98200
 1a20a201
 1a60a601
-c2000343
+c200036b
 1a420400
 20600000
 da200000
@@ -851,21 +891,21 @@
 98467c00
 24417806
 20406730
-243a0370
+243a0398
 1a427e00
 18408440
 98467c00
-24210362
+2421038a
 1a20a201
 1a217e0f
-243a0354
+243a037c
 da200000
-20400369
+20400391
 1c427e00
 67e24fd5
 20600000
 20406730
-243a0373
+243a039b
 1a227e00
 207a0000
 184085c0
@@ -876,44 +916,44 @@
 207a0000
 1fe0ffff
 67e0cfd4
-20400377
-2020036a
+2040039f
+20200392
 1a427e00
 184084a0
-20200358
+20200380
 1a227e00
 207a0000
 18408560
-20200367
+2020038f
 da604fd9
-da40037a
+da4003a2
 202042e0
 6fe0cfda
-c000837e
-c00103a0
+c00083a6
+c00103c8
 20600000
 20406730
-243a038c
-204003ca
+243a03b4
+204003f2
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c5a
-20228398
+202283c0
 da604fc2
-204003c2
+204003ea
 efe1003f
 1fe0fe0a
 e7e10011
 20206371
-204003cd
+204003f5
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c5a
-20428398
+204283c0
 da604fc2
-204003c2
+204003ea
 efe1003f
 1fe0fe0a
 e7e10011
@@ -922,32 +962,32 @@
 da604fc4
 20406371
 da604fc2
-204003c2
+204003ea
 58000650
 e7e10011
 20600000
 20406730
-243a03ae
-204003ca
+243a03d6
+204003f2
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c3c
-202283ba
+202283e2
 da604fd0
-204003c2
+204003ea
 efe1003f
 1fe0fff8
 e7e10011
 20206371
-204003cd
+204003f5
 6fe0cfdb
 1fe0fe01
 67e0cfdb
 1fe67c3c
-204283ba
+204283e2
 da604fd0
-204003c2
+204003ea
 efe1003f
 1fe0fff6
 e7e10011
@@ -956,7 +996,7 @@
 da604fd2
 20406371
 da604fd0
-204003c2
+204003ea
 58000700
 e7e10011
 20600000
@@ -981,7 +1021,7 @@
 6fe0cff3
 207a0000
 da604ff7
-da4003d9
+da400401
 202042e0
 704ff705
 6fe0cff8
@@ -997,22 +1037,22 @@
 20600000
 6fe0cff1
 207a0000
-204003df
+20400407
 24610000
 704ff200
 70440701
 20406ff3
 20406feb
-2040045e
-2040043f
+20400486
+20400467
 67e14fef
 da204fe9
-204003f7
+2040041f
 6fe0c40c
-c2808417
-c300041b
+c280843f
+c3000443
 704ff401
-20200419
+20200441
 efe40011
 67e40670
 20406ff3
@@ -1027,11 +1067,11 @@
 6fe10676
 68490670
 98467c00
-20210413
+2021043b
 68490672
 98467e00
-24210415
-203a0415
+2421043d
+203a043d
 1fefa264
 6fe10670
 68490672
@@ -1086,8 +1126,8 @@
 67f08a0a
 20600000
 6fe0c407
-c0008443
-c001044a
+c000846b
+c0010472
 20600000
 580003e8
 67e14405
@@ -1095,7 +1135,7 @@
 6fe14154
 da600e10
 20406fc0
-20200450
+20200478
 580003e8
 67e14405
 6849414e
@@ -1107,7 +1147,7 @@
 68494158
 9846fc00
 20207d5f
-20400432
+2040045a
 6ff08a09
 793ffe07
 67f08a09
@@ -1116,14 +1156,14 @@
 708a0d61
 708a0b00
 20600000
-20400455
+2040047d
 20406f90
 6fe0c409
 67f080cd
 20406f97
 708a0d60
 7080cd00
-20400455
+2040047d
 6fe0c409
 67f080cd
 708a0b50
@@ -1131,7 +1171,7 @@
 df00000b
 6de1440a
 7080cc03
-20400477
+2040049f
 68590164
 60494158
 20406f9c
@@ -1142,13 +1182,13 @@
 7080cc00
 20600000
 6ff08129
-c3028477
+c302849f
 20600000
 704eaa05
 7049e401
 704eb201
 7049e53c
-2020047f
+202004a7
 58000509
 67e148d6
 58003809
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/output/sched.rom	(revision 5800)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/output/sched.rom	(working copy)
@@ -70,7 +70,7 @@
 #power on config
 mem_ui_button_gpio:ff
 
-mem_le_lap:0d 21 21 98 07 2a
+mem_le_lap:0c 21 21 98 07 2a
 mem_le_name_len:
 'JQVITEK TR15plus
 
Index: program/patch.prog
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/program/patch.prog	(revision 5799)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/program/patch.prog	(working copy)
@@ -709,12 +709,54 @@
 	call p_shutter_adc_read_timer
 	call p_shutter_low_volatage_led_timer
 endif
+	call p_shutter_fun_press_check_timer
+	call p_shutter_fun1_press_check_timer
 	call p_shutter_photo_press_timer
 	call shutter_dy_link_key_loop_timer
 	call shutter_dy_long_key_volume_timer
 	call p_shutter_check_sleep_timer
 	branch shutter_dy_check_power_off_timer
 
+p_shutter_fun_press_check_timer:
+	arg mem_shutter_fun_press_time,regc
+	arg p_shutter_fun_press_timeout,regb
+	branch timer_single_step
+
+p_shutter_fun_press_timeout:
+	fetch 1,mem_shutter_fun_press_count
+	jam 0,mem_shutter_fun_press_count
+	beq 1,p_shutter_fun_press_one
+	beq 2,p_shutter_fun_press_double
+	rtn	
+
+p_shutter_fun_press_one:
+	arg mem_fouse_up_press,regc
+	branch push_buffer_in_queue
+
+p_shutter_fun_press_double:
+	branch p_shutter_key_fun_long_press
+
+
+p_shutter_fun1_press_check_timer:
+	arg mem_shutter_fun1_press_time,regc
+	arg p_shutter_fun1_press_timeout,regb
+	branch timer_single_step
+
+p_shutter_fun1_press_timeout:
+	fetch 1,mem_shutter_fun1_press_count
+	jam 0,mem_shutter_fun1_press_count
+	beq 1,p_shutter_fun1_press_one
+	beq 2,p_shutter_fun1_press_double
+	rtn	
+
+p_shutter_fun1_press_one:
+	arg mem_fouse_down_press,regc
+	branch push_buffer_in_queue
+
+p_shutter_fun1_press_double:
+	branch p_shutter_key_fun1_long_press
+
+
 p_shutter_photo_press_timer:
 	arg mem_photo_press_time,regc
 	arg p_shutter_photo_press_timeout,regb
@@ -903,7 +945,15 @@
 	beq SHUTTER_FUN3_KEY_NUM,p_shutter_fun3_key_release // double photo
 	branch shutter_dy_push_queue_release1_next+4
 
+p_shutter_double_funciton_clear:
+	fetch 1,mem_shutter_fouse_select
+	beq FOUSEUP,p_fouse_up_long_release
+	beq FOUSEDOWN,p_fouse_down_long_release
+	rtn
+
 p_shutter_photo_release:
+	fetch 1,mem_shutter_fouse_select
+	nbranch p_shutter_double_funciton_clear,blank
 	fetch 1,mem_photo_press_count
 	increase 1,pdata
 	store 1,mem_photo_press_count
@@ -911,12 +961,25 @@
 	rtn
 
 p_shutter_fun_key_release:
-	arg mem_fouse_up_press,regc
-	branch push_buffer_in_queue
+	fetch 1,mem_shutter_fouse_select
+	nbranch p_shutter_double_funciton_clear,blank
+	fetch 1,mem_shutter_fun_press_count
+	increase 1,pdata
+	store 1,mem_shutter_fun_press_count
+	jam 4,mem_shutter_fun_press_time
+	rtn
+	
 
 p_shutter_fun1_key_release:
-	arg mem_fouse_down_press,regc
-	branch push_buffer_in_queue
+	fetch 1,mem_shutter_fouse_select
+	nbranch p_shutter_double_funciton_clear,blank
+	fetch 1,mem_shutter_fun1_press_count
+	increase 1,pdata
+	store 1,mem_shutter_fun1_press_count
+	jam 4,mem_shutter_fun1_press_time
+	rtn
+
+	
 
 p_shutter_fun2_key_release:
 	call p_shutter_mode_step_ptr
Index: sched/shutter_dy.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/sched/shutter_dy.dat	(revision 5800)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_JM104_fouse/sched/shutter_dy.dat	(working copy)
@@ -3,7 +3,7 @@
 #power on config
 mem_ui_button_gpio:ff
 
-mem_le_lap:0d 21 21 98 07 2a
+mem_le_lap:0c 21 21 98 07 2a
 mem_le_name_len:
 'JQVITEK TR15plus