Index: format/app_shutter.format
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/format/app_shutter.format	(revision 2444)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/format/app_shutter.format	(working copy)
@@ -163,6 +163,10 @@
 
 1 mem_shutter_ble_connect_flag
 1 mem_shutter_start_adc_flag
+
+1 mem_shutter_count
+1 mem_shutter_sleep_2s_time
+1 mem_shutter_led_setflip
 )
 
 
Index: output/otp.dat
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/output/otp.dat	(revision 2444)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/output/otp.dat	(working copy)
@@ -11,7 +11,7 @@
 00
 aa
 55
-86
+ee
 0b
 c2
 84
@@ -32,7 +32,7 @@
 c0
 0a
 02
-15
+2f
 c0
 0a
 80
@@ -52,11 +52,11 @@
 c0
 12
 82
-69
+83
 c0
 13
 82
-5e
+78
 c0
 58
 80
@@ -67,20 +67,20 @@
 ef
 c0
 6d
-01
-fe
+02
+18
 c0
 6d
 82
-88
+a2
 c0
 6e
 02
-c5
+df
 c0
 6e
 82
-a6
+c0
 20
 20
 23
@@ -88,7 +88,7 @@
 c0
 12
 02
-37
+51
 c0
 12
 80
@@ -100,7 +100,7 @@
 c0
 1c
 82
-31
+4b
 c0
 1f
 80
@@ -108,7 +108,7 @@
 c0
 26
 82
-35
+4f
 c1
 7f
 80
@@ -536,11 +536,11 @@
 20
 40
 01
-d0
+ea
 20
 40
-01
-fb
+02
+15
 20
 40
 00
@@ -555,8 +555,8 @@
 4e
 20
 20
-01
-fd
+02
+17
 20
 75
 80
@@ -1012,7 +1012,7 @@
 58
 00
 00
-50
+64
 67
 e1
 44
@@ -1020,7 +1020,7 @@
 20
 40
 01
-6e
+88
 58
 00
 00
@@ -1068,7 +1068,7 @@
 58
 00
 01
-be
+d8
 67
 e1
 43
@@ -1116,7 +1116,7 @@
 58
 00
 01
-3f
+59
 67
 e1
 45
@@ -1188,7 +1188,7 @@
 20
 20
 01
-3f
+59
 70
 48
 d5
@@ -1200,27 +1200,131 @@
 20
 40
 01
-7d
+97
 20
 40
 01
-5f
+79
 20
 40
 01
-52
+6c
 20
 40
 01
-4a
+64
 20
 40
-63
-18
+01
+2f
+20
+40
+01
+37
 20
 20
 01
-2e
+48
+da
+60
+46
+ca
+da
+40
+01
+32
+20
+20
+42
+e0
+6f
+e1
+44
+e9
+c2
+84
+e3
+9e
+20
+40
+43
+25
+70
+48
+d7
+05
+20
+60
+00
+00
+da
+60
+48
+d7
+da
+40
+01
+3a
+20
+20
+42
+e0
+6f
+e0
+c8
+d6
+1f
+e0
+fe
+01
+67
+e0
+c8
+d6
+1f
+e6
+7c
+07
+20
+22
+81
+45
+70
+48
+d7
+01
+6f
+e0
+c8
+d8
+79
+40
+7e
+00
+67
+e0
+c8
+d8
+c0
+00
+c3
+23
+20
+20
+43
+25
+70
+48
+d7
+00
+20
+40
+43
+25
+20
+20
+43
+27
 6f
 e0
 c5
@@ -1236,7 +1340,7 @@
 da
 40
 01
-33
+4d
 20
 20
 42
@@ -1340,7 +1444,7 @@
 da
 40
 01
-4d
+67
 20
 20
 42
@@ -1388,11 +1492,11 @@
 24
 3a
 01
-5c
+76
 20
 20
 01
-59
+73
 6f
 e2
 44
@@ -1448,7 +1552,7 @@
 20
 22
 81
-6a
+84
 da
 60
 48
@@ -1456,7 +1560,7 @@
 da
 40
 01
-71
+8b
 20
 20
 42
@@ -1468,7 +1572,7 @@
 da
 40
 01
-6d
+87
 20
 20
 42
@@ -1520,11 +1624,11 @@
 c0
 00
 01
-7c
+96
 c0
 00
 81
-7b
+95
 20
 60
 00
@@ -1548,7 +1652,7 @@
 20
 40
 01
-98
+b2
 24
 61
 00
@@ -1572,11 +1676,11 @@
 20
 40
 02
-c5
+df
 20
 40
 02
-a6
+c0
 67
 e1
 48
@@ -1588,7 +1692,7 @@
 20
 40
 01
-9e
+b8
 6f
 e0
 c4
@@ -1596,7 +1700,7 @@
 c3
 00
 01
-90
+aa
 70
 48
 c6
@@ -1604,7 +1708,7 @@
 20
 20
 01
-8e
+a8
 70
 48
 c5
@@ -1624,11 +1728,11 @@
 c2
 85
 81
-94
+ae
 20
 40
 01
-7c
+96
 6f
 e0
 c8
@@ -1728,7 +1832,7 @@
 20
 21
 01
-ba
+d4
 68
 49
 06
@@ -1740,11 +1844,11 @@
 24
 21
 01
-bc
+d6
 20
 3a
 01
-bc
+d6
 1f
 ef
 a2
@@ -1804,15 +1908,15 @@
 c0
 18
 81
-c3
+dd
 c0
 0a
 81
-c5
+df
 c0
 1f
 81
-c9
+e3
 20
 20
 62
@@ -1840,7 +1944,7 @@
 20
 20
 01
-3f
+59
 70
 48
 d4
@@ -1919,8 +2023,8 @@
 06
 20
 40
-01
-ed
+02
+07
 2a
 2f
 fe
@@ -1951,8 +2055,8 @@
 1e
 20
 40
-01
-ed
+02
+07
 d8
 a0
 8a
@@ -1980,7 +2084,7 @@
 20
 21
 01
-e2
+fc
 20
 20
 21
@@ -2084,7 +2188,7 @@
 20
 40
 02
-0e
+28
 70
 8a
 08
@@ -2128,7 +2232,7 @@
 c3
 02
 82
-0f
+29
 68
 59
 01
@@ -2164,7 +2268,7 @@
 c0
 08
 02
-2e
+48
 58
 00
 57
@@ -2208,7 +2312,7 @@
 c0
 08
 02
-2b
+45
 58
 00
 2b
@@ -2244,7 +2348,7 @@
 20
 20
 02
-27
+41
 58
 00
 83
@@ -2256,7 +2360,7 @@
 20
 20
 02
-1c
+36
 6f
 e0
 c3
@@ -2288,7 +2392,7 @@
 c5
 97
 82
-3d
+57
 78
 3c
 fc
@@ -2332,7 +2436,7 @@
 20
 37
 02
-46
+60
 1b
 42
 04
@@ -2380,7 +2484,7 @@
 20
 40
 02
-54
+6e
 6f
 e0
 81
@@ -2504,7 +2608,7 @@
 20
 40
 02
-70
+8a
 20
 20
 24
@@ -2576,7 +2680,7 @@
 20
 22
 82
-83
+9d
 e7
 e0
 80
@@ -2596,7 +2700,7 @@
 c2
 00
 02
-7d
+97
 1a
 42
 04
@@ -2732,11 +2836,11 @@
 c0
 00
 82
-aa
+c4
 c0
 01
 02
-b1
+cb
 20
 60
 00
@@ -2768,7 +2872,7 @@
 20
 20
 02
-b7
+d1
 58
 00
 03
@@ -2816,7 +2920,7 @@
 20
 40
 02
-99
+b3
 6f
 f0
 8a
@@ -2852,7 +2956,7 @@
 20
 40
 02
-bc
+d6
 20
 40
 6f
@@ -2880,7 +2984,7 @@
 20
 40
 02
-bc
+d6
 6f
 e0
 c4
@@ -2912,7 +3016,7 @@
 20
 40
 02
-de
+f8
 68
 59
 01
@@ -2956,13 +3060,13 @@
 c3
 02
 82
-de
+f8
 20
 60
 00
 00
-9e
-95
+c9
+f8
 aa
 55
 40
@@ -3087,8 +3191,8 @@
 11
 05
 90
-00
-ff
+01
+05
 00
 aa
 55
@@ -3110,14 +3214,14 @@
 00
 9e
 48
-b8
-0b
-b8
-0b
-b8
-0b
-b8
-0b
+08
+07
+70
+17
+08
+07
+08
+07
 96
 00
 96
@@ -3372,7 +3476,7 @@
 aa
 aa
 55
-45
-5d
-82
-7d
+f4
+59
+48
+06
Index: output/romcode.rom
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/output/romcode.rom	(revision 2444)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/output/romcode.rom	(working copy)
@@ -17472,48 +17472,48 @@
 c00063d3
 c000e3d6
 20600000
-6fe34f1c
+6fe34f1f
 67e34526
 70452306
 58004523
 67e1442c
 20600000
-6fe3cf1c
+6fe3cf1f
 67e3c526
 70452307
 58004523
 67e1442c
 20600000
-6fe44f1c
+6fe44f1f
 67e44526
 70452308
 58004523
 67e1442c
 20600000
-6fe0cf1b
+6fe0cf1e
 c0036442
 c003e448
 c004644e
 20600000
 44d0c014
-6fe44f42
+6fe44f45
 67e44512
 58000096
 67e144f6
-6fe3cf92
+6fe3cf95
 67e3c6a7
-6fe3cf99
+6fe3cf9c
 67e3c6b2
-6fe24fa0
+6fe24fa3
 67e244fa
-6fe24fa4
+6fe24fa7
 67e244fe
 5800000e
 67e144f2
 58000140
 67e144f4
 67e14389
-6fe44f3a
+6fe44f3d
 67e4450a
 20600000
 20407396
@@ -17531,7 +17531,7 @@
 58006505
 67e14524
 204062c2
-6fe14fbf
+6fe14fc2
 67e14332
 6fe4450a
 67e44502
@@ -17550,7 +17550,7 @@
 2020656e
 5800001f
 1feffe0a
-d8404c3a
+d8404c3d
 9840a200
 1a20a203
 d8400062
@@ -17570,21 +17570,21 @@
 247a0000
 204078fa
 207a0000
-684a4a1e
+684a4a21
 1c427e00
 98460400
 20628000
 242164ac
-6fe0ca1d
+6fe0ca20
 98467c00
 20610000
 1c427e00
-67e24a1e
+67e24a21
 20406385
 24740000
 1fe0ffff
 1feffe0a
-d8404c3a
+d8404c3d
 98408c00
 202063cb
 20406858
@@ -17594,12 +17594,12 @@
 204064d3
 20406311
 202064d9
-da604ef9
+da604efc
 da4064bf
 202042e0
 204078fa
 247a0000
-6fe148e4
+6fe148e7
 247a0000
 20406730
 203a64cd
@@ -17609,19 +17609,19 @@
 18e27e00
 2fe00e01
 2020e4d1
-da604eee
+da604ef1
 20206371
-da604f02
+da604f05
 20206371
-da604f07
+da604f0a
 20206371
-da604f11
+da604f14
 20206371
-da604c37
+da604c3a
 da4064d6
 202042e0
 df20000a
-d8a04a2c
+d8a04a2f
 20207ca1
 da6046ca
 da4064dc
@@ -17636,22 +17636,22 @@
 c1200000
 c01966c8
 202062d9
-704efa01
+704efd01
 20406783
-6fe14fac
-67e14ee6
-68494fae
+6fe14faf
+67e14ee9
+68494fb1
 58000fff
 98467e00
-67e14ee8
+67e14eeb
 20600000
-704ee300
-704efa00
+704ee600
+704efd00
 204065ad
 20406500
 202062e6
 1c427e00
-67e24a1e
+67e24a21
 20406729
 202062e2
 78567c00
@@ -17662,7 +17662,7 @@
 20406351
 24740000
 20207dbe
-704efd00
+704f0000
 20600000
 18e27e00
 c1808000
@@ -17672,23 +17672,23 @@
 1a227e00
 203a6537
 44d1c014
-6fe0cfd7
+6fe0cfda
 243a6502
-704c3801
+704c3b01
 20404323
 2040652c
 20406561
 20216500
 18e27e00
-6848cefd
+6848cf00
 98467c00
 2442e526
 18e27e00
-67e0cefd
-6848cf00
+67e0cf00
+6848cf03
 98467c00
 2022e524
-6fe0cf01
+6fe0cf04
 243a651f
 20406732
 dfe0000a
@@ -17698,17 +17698,17 @@
 c000e51c
 20406642
 202065f4
-704efe01
+704f0101
 202065f4
 44d24014
-6fe0cf01
+6fe0cf04
 203a64c3
 18e27e00
 c000e4c3
 20600000
 dfe0000a
 98effe00
-da604a22
+da604a25
 9a60a600
 1c427e00
 e7e20013
@@ -17718,11 +17718,11 @@
 e7e08013
 20600000
 44d2c014
-6fe0cf01
+6fe0cf04
 205a654b
 dfe0000a
 98effe00
-da604a22
+da604a25
 9a60a600
 e8420013
 18467c00
@@ -17737,14 +17737,14 @@
 1c427e00
 e7e20013
 20600000
-6fe0cfd7
+6fe0cfda
 243a4323
 20204325
 1a608c04
 efe08006
 20206551
 2040656b
-6fe0cf01
+6fe0cf04
 243a655d
 20406561
 20216500
@@ -17764,23 +17764,23 @@
 98467e00
 1fe67c0a
 20600000
-704ef801
+704efb01
 2040656b
-da604ae6
+da604ae9
 dfe00003
 2020655a
 df20000a
 1a620a00
 20207ca1
-6fe148e4
+6fe148e7
 67e1442e
 204065be
 6fe1442e
-67e148e4
+67e148e7
 d8e00000
 6fe0c523
 1fe27200
-da604a22
+da604a25
 1f227e00
 67e10678
 1a627e00
@@ -17815,12 +17815,12 @@
 1a60a609
 58000001
 e7e08013
-6fe0cef8
+6fe0cefb
 207a0000
-704ef800
+704efb00
 44d34014
 20406755
-6fe0ceff
+6fe0cf02
 c00065a2
 c000e5a5
 20600000
@@ -17828,19 +17828,19 @@
 dfe00003
 2020655a
 18e27e00
-6848cf00
+6848cf03
 98467c00
 2422e5a2
-6fe0cf01
+6fe0cf04
 79407e00
-67e0cf01
+67e0cf04
 247a0000
-704f0100
+704f0400
 20204325
-da604ad1
+da604ad4
 20406730
 207a0000
-da604bf8
+da604bfb
 20600000
 1a60a405
 efe20012
@@ -17864,7 +17864,7 @@
 6fe0c388
 247a0000
 44d3c014
-6fe0ceff
+6fe0cf02
 c000e5cf
 20406628
 204065dc
@@ -17875,15 +17875,15 @@
 7006fa00
 18000e00
 2020703b
-6fe0cefd
-6848cf00
+6fe0cf00
+6848cf03
 98467c00
 2022c323
-6fe0cf01
+6fe0cf04
 243a4325
 20600000
 d8e00000
-da404afb
+da404afe
 dfe00002
 98effe00
 9a40a400
@@ -17894,9 +17894,9 @@
 2022e5e8
 18e08e01
 202065dd
-67e14b07
+67e14b0a
 20404323
-da604b09
+da604b0c
 dfe0000a
 98effe00
 9a60a600
@@ -17914,78 +17914,78 @@
 20406382
 20406730
 207a0000
-704a1d78
+704a2078
 dfe00006
 20206382
-6848cee2
+6848cee5
 20406730
 207a0000
-6848cee5
+6848cee8
 18408401
-6fe0cefe
+6fe0cf01
 207a0000
-6848cee2
-704efe00
+6848cee5
+704f0100
 20600000
 204065ff
 18427e00
 207a0000
-67e0ceeb
+67e0ceee
 dfe00013
 20406382
-6fe0ceeb
+6fe0ceee
 1fe0ffff
-67e0ceeb
+67e0ceee
 207a0000
 2020660d
-6fe0cee4
+6fe0cee7
 207a0000
-67e0ceec
+67e0ceef
 dfe00020
 20406382
-6fe0ceec
+6fe0ceef
 1fe0ffff
-67e0ceec
+67e0ceef
 207a0000
 20206617
-6fe0cee5
+6fe0cee8
 207a0000
-67e0ceed
+67e0cef0
 dfe00021
 20406382
-6fe0ceed
+6fe0cef0
 1fe0ffff
-67e0ceed
+67e0cef0
 207a0000
 20206621
-6fe14b07
+6fe14b0a
 207a0000
 684906f1
 18467c00
 2022e636
 98467c00
 20628000
-60494b07
-6fe14efb
+60494b0a
+6fe14efe
 98467c00
 2042c325
 6fe106f1
 67e1442e
 20207dba
-704ef801
+704efb01
 20404325
-da604b45
+da604b48
 204065f0
 58000000
-67e14b07
-7048d632
+67e14b0a
+7048d932
 20406633
 6fe0c523
 1feff20a
-d8a04a22
+d8a04a25
 20207ca1
 44d44015
-6fe0ceff
+6fe0cf02
 c000e647
 c000664d
 20600000
@@ -18006,29 +18006,29 @@
 243a665e
 58000004
 1feffe0a
-d8404c3a
+d8404c3d
 98408a00
 18a08a03
-6fe1cb4f
+6fe1cb52
 e7e18005
 20600000
 58000004
 1feffe0a
-d8404c3a
+d8404c3d
 98408a00
 18a08a03
-6fe14ee6
+6fe14ee9
 e7e18005
 18a08a07
-6fe14ee8
+6fe14eeb
 1ff27e00
 1fed7e00
 e7e18005
 20600000
-6fe0cee4
+6fe0cee7
 207a0000
 1fe0ffff
-67e0cee4
+67e0cee7
 dfe00062
 20600000
 d840000a
@@ -18037,47 +18037,47 @@
 d8400007
 20600000
 20406671
-6fe14ee6
+6fe14ee9
 98467c00
 2441666b
 24610000
 98467e00
-67e14ee6
+67e14ee9
 44d4c015
-6fe14ee6
-68494ee8
+6fe14ee9
+68494eeb
 184d0400
 18520400
 9840fe00
-67e1cb4f
+67e1cb52
 20206654
-6fe14ee6
+6fe14ee9
 d8400062
 98460400
 24610000
 18427e00
-6848cee4
+6848cee7
 18467c03
 2022e690
 18408401
-6048cee4
+6048cee7
 2020667c
-704ee400
+704ee700
 dfe00000
 2020667c
 20406730
 245a6685
 20406671
-6fe14ee6
+6fe14ee9
 9840fe00
 d8400fff
 20407d6c
 2020667c
 20406671
-6fe14ee8
+6fe14eeb
 98467e00
-67e14ee8
-68494ee8
+67e14eeb
+68494eeb
 20406730
 203a667d
 58000fff
@@ -18087,29 +18087,29 @@
 2421667d
 58000fff
 98467e00
-6848cee5
+6848cee8
 18467c05
 2022e6af
 18408401
-6048cee5
+6048cee8
 202066bc
-704ee500
+704ee800
 58000fff
 202066bc
 20406730
 203a66b0
-6fe0cee5
+6fe0cee8
 203a66b0
 1fe0ffff
-67e0cee5
+67e0cee8
 58000fff
 d8400062
 98467e00
 9a20fe00
-67e14ee8
+67e14eeb
 2020667d
 20406671
-6fe14ee8
+6fe14eeb
 9840fe00
 d8400fff
 98462200
@@ -18129,7 +18129,7 @@
 e7e10005
 58002800
 e7e10005
-d8c04a0c
+d8c04a0f
 20207c8f
 44d54015
 1a220c00
@@ -18149,10 +18149,10 @@
 2422ad50
 20406730
 243a66e9
-68494a08
+68494a0b
 202066ea
-68494a0a
-d8c048e6
+68494a0d
+d8c048e9
 20407c6d
 18427e00
 9a267e00
@@ -18175,34 +18175,34 @@
 6fe14332
 98467c00
 2422ad1d
-d8c048e6
+d8c048e9
 18007e17
 20202d2d
 44d5c015
-704ee205
-704a1c01
-704eea01
-704a1df0
-704ef90a
-704efe01
+704ee505
+704a1f01
+704eed01
+704a20f0
+704efc0a
+704f0101
 204067bf
-6fe0cefa
+6fe0cefd
 207a0000
 20406783
 d8400062
-6fe14fb0
-da204ee6
-da404ee4
+6fe14fb3
+da204ee9
+da404ee7
 2040671e
 d8400062
-6fe14fb2
-da204ee8
-da404ee5
+6fe14fb5
+da204eeb
+da404ee8
 2040671e
 58000fff
-68494ee8
+68494eeb
 98467e00
-67e14ee8
+67e14eeb
 20600000
 9846fc00
 20407d62
@@ -18215,33 +18215,33 @@
 efe08006
 c003672e
 20600000
-704ee201
-704a1c00
-704eea00
-704a1d0a
+704ee501
+704a1f00
+704eed00
+704a200a
 20600000
 20406729
 202067bf
-6fe0ca1c
+6fe0ca1f
 20600000
-da604f4c
+da604f4f
 20406730
 207a0000
-704a1d78
-da604b53
+704a2078
+da604b56
 20600000
-da604a68
+da604a6b
 20406730
 207a0000
-da604b8f
-704a1d0c
+da604b92
+704a200c
 18e27e00
 c1008000
 20600000
 44d64015
-6fe0cc36
+6fe0cc39
 79407e00
-67e0cc36
+67e0cc39
 c0006749
 c000e747
 20600000
@@ -18249,191 +18249,191 @@
 20206371
 2040674b
 20206371
-da604a95
+da604a98
 20406730
 207a0000
-da604bbc
+da604bbf
 20600000
-da604c22
+da604c25
 20406730
 207a0000
-da604c2c
+da604c2f
 20600000
 18e27e00
 c000e777
 c0016765
 c0026761
 20600000
-da604fc5
+da604fc8
 da40675d
 202042e0
-704fc504
-6fe0cc36
+704fc804
+6fe0cc39
 203a6761
 20206765
-704c3600
-704fc504
-da604add
+704c3900
+704fc804
+da604ae0
 20206371
-704c3601
-704fc504
-da604ad7
+704c3901
+704fc804
+da604ada
 20206371
-704c3600
-704fc500
+704c3900
+704fc800
 20600000
-da604fc6
+da604fc9
 da40676f
 202042e0
-704fc602
+704fc902
 20406772
 20206371
-da604fc7
+da604fca
 20406730
 207a0000
-da604fcf
+da604fd2
 20600000
-6fe0cfd7
+6fe0cfda
 243a677c
-704fd701
-704fc602
+704fda01
+704fc902
 20600000
-704fd700
-704fc600
+704fda00
+704fc900
 20600000
-6fe0cee3
+6fe0cee6
 247a0000
-704ee301
+704ee601
 2020667d
 58000000
-67e3cee4
+67e3cee7
 20600000
 20406730
 c000e78e
 c00067a0
 20600000
-6fe0cfb8
+6fe0cfbb
 c000e7a7
 c00067b9
 20600000
-6fe0cee4
+6fe0cee7
 1feffe62
 1fe20400
-6fe14ee6
+6fe14ee9
 9840fe00
-67e14fb4
-6fe0cee5
+67e14fb7
+6fe0cee8
 1feffe62
 1fe20400
-6fe14ee8
+6fe14eeb
 1fe22200
 58000fff
 9a267e00
 9840fe00
-67e14fb6
+67e14fb9
 20406730
-67e0cfb8
+67e0cfbb
 20600000
-6fe14ee6
-67e14fb4
-6fe14ee8
-67e14fb6
+6fe14ee9
+67e14fb7
+6fe14eeb
+67e14fb9
 20406730
-67e0cfb8
+67e0cfbb
 20600000
-6fe14fb4
+6fe14fb7
 1fe6fc62
 20407d62
 1807fe00
 18070400
-67e0cee4
+67e0cee7
 18427e00
-67e14ee6
-6fe14fb6
+67e14ee9
+6fe14fb9
 1fe6fc62
 20407d62
 1807fe00
 18070400
-67e0cee5
+67e0cee8
 58000fff
 98467e00
-67e14ee8
+67e14eeb
 20600000
-6fe14fb4
-67e14ee6
-6fe14fb6
-67e14ee8
+6fe14fb7
+67e14ee9
+6fe14fb9
+67e14eeb
 20600000
 2020683c
 20206823
 204067e2
-6fe14fbb
+6fe14fbe
 2040684f
-704fc300
-6fe2cfb4
+704fc600
+6fe2cfb7
+704fc700
 704fc400
-704fc100
 204067e6
-6fe0cfc1
+6fe0cfc4
 c1000000
 202067c0
-6fe14fa8
+6fe14fab
 1fe0fffb
-67e14fbb
+67e14fbe
 20600000
-6fe14fbb
+6fe14fbe
 1fe0fffb
-67e14fbb
+67e14fbe
 20600000
-6fe14fbb
+6fe14fbe
 1fe0fe05
-67e14fbb
+67e14fbe
 20600000
-6fe14fbd
+6fe14fc0
 1fe0fe05
-67e14fbd
-6fe14fbd
+67e14fc0
+6fe14fc0
 1fe20400
-6fe14fa8
+6fe14fab
 98467e00
 d8400005
 98467c00
 24216806
 20600000
-6fe0cfc3
+6fe0cfc6
 c000e7cb
 c00067cf
 20600000
 da400000
 1a420400
-6fe14fb4
+6fe14fb7
 a843fe00
 2440e7f6
 da400000
 1a420400
-6fe14fb6
+6fe14fb9
 a843fe00
 2440e7f6
 da400000
 1a420400
-6fe0cfb8
+6fe0cfbb
 a841fe00
 2440e7f6
 20600000
-6fe0cfc1
+6fe0cfc4
 1fe0fe01
-67e0cfc1
+67e0cfc4
 20600000
-704fc101
+704fc401
 204067d7
-6fe14fbd
+6fe14fc0
 2040684f
 20406730
 1fe20400
-6fe0cfb8
+6fe0cfbb
 a841fe00
 2040e821
-6fe0cfc1
+6fe0cfc4
 c1000000
 202067fa
 44d6c015
@@ -18441,84 +18441,84 @@
 20406730
 203a680b
 20206812
-6fe14fac
-67e14ee6
-68494fae
+6fe14faf
+67e14ee9
+68494fb1
 58000fff
 98467e00
-67e14ee8
+67e14eeb
 202067be
 d8400062
-6fe14fb0
-da204ee6
-da404ee4
+6fe14fb3
+da204ee9
+da404ee7
 2040671e
 d8400062
-6fe14fb2
-da204ee8
-da404ee5
+6fe14fb5
+da204eeb
+da404ee8
 2040671e
 58000fff
-68494ee8
+68494eeb
 98467e00
-67e14ee8
+67e14eeb
 202067be
-704fc100
+704fc400
 20600000
 44d74015
-704fc301
+704fc601
 204067c0
-6fe14faa
+6fe14fad
 1fe20400
-6fe14fbb
+6fe14fbe
 98467e00
 d8400000
 98467c00
 24610000
-6fe14fbb
+6fe14fbe
 1fe20400
-6fe14fa8
+6fe14fab
 1fe0fffb
 98467e00
-6fe14fbb
-67e14fbd
+6fe14fbe
+67e14fc0
 204067fa
-6fe14fbd
+6fe14fc0
 2442e84f
-704fc100
+704fc400
 204067e6
-6fe0cfc1
+6fe0cfc4
 c1000000
 2020678a
 44d7c015
-704fc301
+704fc601
 204067c0
-68494faa
-6fe14fbb
+68494fad
+6fe14fbe
 98467e00
 d8400000
 98467c00
 24610000
-68494fbb
-6fe14fa8
+68494fbe
+6fe14fab
 98467e00
 d8400000
 98467c00
 24610000
-6fe14fbb
-67e14fb9
+6fe14fbe
+67e14fbc
 20406786
 20206854
 44d84016
 1fe22400
 df200005
-da204fb4
+da204fb7
 20206b74
 df200005
-da204fb4
-6a414fb9
+da204fb7
+6a414fbc
 20206b45
-da6048d6
+da6048d9
 da4067be
 202042e0
 6fe10912
@@ -24573,4 +24573,4 @@
 00000000
 00000000
 00000000
-0000f3c1
\ No newline at end of file
+0000947e
\ No newline at end of file
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/output/sched.rom	(revision 2444)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/output/sched.rom	(working copy)
@@ -73,8 +73,8 @@
 mem_le_name_len:
 'ADYSS
 
-mem_shutter_key_conf0_temp:11 05 90 00 ff
-# mem_shutter_key_conf0_temp:15 08 8c 00 ff
+mem_shutter_key_conf0_temp:11 05 90 01 05
+# mem_shutter_key_conf0_temp:ff 08 8c 01 08
 
 mem_shutter_soft_switch_first_power_on:00
 
@@ -84,10 +84,10 @@
 
 mem_shutter_dy_conf:00
 mem_shutter_discovery_time_conf:
-b8 0b #discovery_timeout
-b8 0b #connect_timeout
-b8 0b #sleep_timeout
-b8 0b #sleep_timer
+08 07 #discovery_timeout
+70 17  #connect_timeout
+08 07 #sleep_timeout
+08 07 #sleep_timer
 
 mem_shutter_reconn_or_discovery_blink_time_conf:
 96 00 #mem_ble_shutter_reconn_blink_on_time
Index: program/patch.prog
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/program/patch.prog	(revision 2444)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/program/patch.prog	(working copy)
@@ -315,14 +315,13 @@
 	// jam 0xc0,0x80d5	//gpio17
 	// jam 0xc0,0x807d	//gpio13
 	jam 0xc0,0x80d6 //gpio18
-
 	call enable_authrom
 	rtn wake
 
 	jam 1,mem_shutter_start_adc_flag
 	setarg 0x1e14
 	store 2,mem_shutter_soft_switch_poweron_time
-	setarg 0x0050
+	setarg 0x0064
 	store 2,mem_ble_shutter_reconn_timeout
 ifdef ADC_1121SB
 	call p_shutter_low_voltage_blink_time_init
@@ -397,9 +396,50 @@
 endif
 	call p_shutter_led_set1_timer //低电优先广播灯效	
 	call p_shutter_check_sleep_timer
-	call shutter_check_power_off_timer
+	call p_shutter_check_power_off_timer
+	call p_shutter_check_2s_timer
 	branch p_ble_shutter_reconn_timer
 
+p_shutter_check_power_off_timer:
+	arg mem_shutter_power_off_timer,regc
+	arg p_shutter_check_power_off_timeout,regb
+	branch timer_single_step
+
+p_shutter_check_power_off_timeout:
+	fetch 2,mem_ui_state_map
+	bbit1 UI_STATE_BLE_CONNECTED,shutter_wait_power_off
+	// fetch 1,mem_shutter_led_struct_app_led_type
+	// beq UI_LED_STATE_BLINK_START,shutter_wait_power_off
+	// beq UI_LED_STATE_BLINK_LIGHTING,shutter_wait_power_off
+	// beq UI_LED_STATE_BLINK_DARKING,shutter_wait_power_off
+	call app_led_off
+	jam 5,mem_shutter_sleep_2s_time
+	rtn
+	// branch app_enter_hibernate
+
+p_shutter_check_2s_timer:
+	arg mem_shutter_sleep_2s_time,regc
+	arg p_shutter_check_2s_timeout,regb
+	branch timer_single_step
+
+p_shutter_check_2s_timeout:
+	fetch 1,mem_shutter_count
+	increase 1,pdata
+	store 1,mem_shutter_count
+	sub pdata,7,null
+	branch p_shutter_wait_power_off,zero
+	jam 1,mem_shutter_sleep_2s_time
+	fetch 1,mem_shutter_led_setflip
+	setflip 0,pdata
+	store 1,mem_shutter_led_setflip
+	beq 1,app_led_on
+	branch app_led_off
+
+p_shutter_wait_power_off:
+	jam 0,mem_shutter_sleep_2s_time
+	call app_led_off
+	branch app_enter_hibernate
+
 p_ble_shutter_reconn_timer:
 	fetch 1,mem_shutter_soft_switch_power_state
 	rtnne SS_STATE_POWER_ON
@@ -441,6 +481,7 @@
 	arg mem_shutter_sleep_timer,regc
 	arg p_shutter_sleep_timeout,regb
 	branch timer_single_step_2B
+
 p_shutter_sleep_timeout:
 	jam 0,mem_shutter_start_adc_flag
 	jam SS_STATE_POWER_OFF,mem_shutter_soft_switch_power_state
Index: sched/shutter.dat
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/sched/shutter.dat	(revision 2444)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_led7_key8/sched/shutter.dat	(working copy)
@@ -6,8 +6,8 @@
 mem_le_name_len:
 'ADYSS
 
-mem_shutter_key_conf0_temp:11 05 90 00 ff
-# mem_shutter_key_conf0_temp:15 08 8c 00 ff
+mem_shutter_key_conf0_temp:11 05 90 01 05
+# mem_shutter_key_conf0_temp:ff 08 8c 01 08
 
 mem_shutter_soft_switch_first_power_on:00
 
@@ -17,10 +17,10 @@
 
 mem_shutter_dy_conf:00
 mem_shutter_discovery_time_conf:
-b8 0b #discovery_timeout
-b8 0b #connect_timeout
-b8 0b #sleep_timeout
-b8 0b #sleep_timer
+08 07 #discovery_timeout
+70 17  #connect_timeout
+08 07 #sleep_timeout
+08 07 #sleep_timer
 
 mem_shutter_reconn_or_discovery_blink_time_conf:
 96 00 #mem_ble_shutter_reconn_blink_on_time