Index: output/otp.dat
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_adc_t20/output/otp.dat	(revision 4700)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_adc_t20/output/otp.dat	(working copy)
@@ -11,7 +11,7 @@
 00
 aa
 55
-36
+f2
 0d
 c2
 84
@@ -32,7 +32,7 @@
 c0
 0a
 02
-77
+a6
 c0
 0a
 81
@@ -52,11 +52,11 @@
 c0
 12
 82
-cb
+fa
 c0
 13
 82
-c0
+ef
 c0
 58
 81
@@ -68,19 +68,19 @@
 c0
 6d
 02
-60
+8f
 c0
 6d
-82
-f4
+83
+23
 c0
 6e
 03
-31
+60
 c0
 6e
 83
-12
+41
 20
 20
 23
@@ -88,7 +88,7 @@
 c0
 12
 02
-99
+c8
 c0
 12
 80
@@ -100,7 +100,7 @@
 c0
 1c
 82
-93
+c2
 c0
 1d
 00
@@ -112,7 +112,7 @@
 c0
 26
 82
-97
+c6
 c1
 7f
 80
@@ -720,11 +720,11 @@
 20
 40
 02
-32
+61
 20
 40
 02
-5d
+8c
 20
 40
 00
@@ -740,7 +740,7 @@
 20
 20
 02
-5f
+8e
 20
 75
 80
@@ -1212,7 +1212,7 @@
 20
 40
 01
-d0
+ff
 58
 00
 00
@@ -1260,7 +1260,7 @@
 58
 00
 02
-20
+4f
 67
 e1
 43
@@ -1276,15 +1276,15 @@
 58
 00
 01
-70
+9f
 67
 e1
 43
 e3
 58
 00
-63
-65
+01
+70
 67
 e1
 45
@@ -1308,7 +1308,7 @@
 58
 00
 01
-a1
+d0
 67
 e1
 45
@@ -1380,7 +1380,7 @@
 20
 20
 01
-a1
+d0
 70
 48
 d5
@@ -1487,32 +1487,220 @@
 dd
 20
 40
+63
+5d
+24
+76
+00
+00
+1a
+22
+7e
+00
+20
+3a
+01
+77
+70
+48
+da
+00
+20
+40
+43
+23
+20
+20
 01
+81
+70
+48
+da
+01
+70
+48
+d9
+00
+20
+40
+43
+25
+da
+60
+45
+56
+6f
+e0
+c8
+d9
+24
+7a
+00
+00
+6f
+e0
+c8
+da
+24
+3a
+01
+80
+70
+48
+d9
+01
+20
+20
+63
+71
+6f
+e0
+c8
+db
+79
+40
+7e
+00
+67
+e0
+c8
+db
+c0
+00
+01
+91
+c0
+00
+81
+87
+20
+60
+00
+00
+58
+00
+00
+00
+67
+e1
+45
+2e
+58
+00
+00
+01
+67
+e1
+45
+33
+58
+00
+06
+01
+67
+e1
+45
+56
+58
+00
+00
+06
+67
+e1
+45
+5b
+da
+60
+45
+2e
+20
+20
+01
+9b
+58
+00
+00
+00
+67
+e1
+45
+2e
+58
+00
+00
+02
+67
+e1
+45
+33
+58
+00
+06
+02
+67
+e1
+45
+56
+58
+00
+00
+06
+67
+e1
+45
+5b
+da
+60
+45
+2e
+20
+20
+01
+9b
 df
+e0
+00
+05
+98
+ef
+fe
+00
+9a
+60
+a6
+00
+20
+20
+63
+71
+20
+40
+02
+0e
 20
 40
 01
-c1
+f0
 20
 40
 01
-b4
+e3
 20
 40
 01
-ac
+db
 20
 40
 01
-77
+a6
 20
 40
 01
-7f
+ae
 20
 20
 01
-90
+bf
 da
 60
 46
@@ -1520,7 +1708,7 @@
 da
 40
 01
-7a
+a9
 20
 20
 42
@@ -1552,7 +1740,7 @@
 da
 40
 01
-82
+b1
 20
 20
 42
@@ -1576,7 +1764,7 @@
 20
 22
 81
-8d
+bc
 70
 48
 d7
@@ -1628,7 +1816,7 @@
 da
 40
 01
-95
+c4
 20
 20
 42
@@ -1732,7 +1920,7 @@
 da
 40
 01
-af
+de
 20
 20
 42
@@ -1780,11 +1968,11 @@
 24
 3a
 01
-be
+ed
 20
 20
 01
-bb
+ea
 6f
 e2
 44
@@ -1840,15 +2028,15 @@
 20
 22
 81
-cc
+fb
 da
 60
 48
 cc
 da
 40
-01
-d3
+02
+02
 20
 20
 42
@@ -1860,7 +2048,7 @@
 da
 40
 01
-cf
+fe
 20
 20
 42
@@ -1911,12 +2099,12 @@
 ce
 c0
 00
-01
-de
+02
+0d
 c0
 00
-81
-dd
+82
+0c
 20
 60
 00
@@ -1939,8 +2127,8 @@
 00
 20
 40
-01
-fa
+02
+29
 24
 61
 00
@@ -1964,11 +2152,11 @@
 20
 40
 03
-31
+60
 20
 40
 03
-12
+41
 67
 e1
 48
@@ -1980,23 +2168,23 @@
 20
 40
 02
-00
+2f
 6f
 e0
 c4
 0c
 c3
 00
-01
-f2
+02
+21
 70
 48
 c6
 01
 20
 20
-01
-f0
+02
+1f
 70
 48
 c5
@@ -2015,12 +2203,12 @@
 e9
 c2
 85
-81
-f6
+82
+25
 20
 40
-01
-de
+02
+0d
 6f
 e0
 c8
@@ -2120,7 +2308,7 @@
 20
 21
 02
-1c
+4b
 68
 49
 06
@@ -2132,11 +2320,11 @@
 24
 21
 02
-1e
+4d
 20
 3a
 02
-1e
+4d
 1f
 ef
 a2
@@ -2196,15 +2384,15 @@
 c0
 18
 82
-25
+54
 c0
 0a
 82
-27
+56
 c0
 1f
 82
-2b
+5a
 20
 20
 62
@@ -2232,7 +2420,7 @@
 20
 20
 01
-a1
+d0
 70
 48
 d4
@@ -2312,7 +2500,7 @@
 20
 40
 02
-4f
+7e
 2a
 2f
 fe
@@ -2344,7 +2532,7 @@
 20
 40
 02
-4f
+7e
 d8
 a0
 8a
@@ -2372,7 +2560,7 @@
 20
 21
 02
-44
+73
 20
 20
 21
@@ -2476,7 +2664,7 @@
 20
 40
 02
-70
+9f
 70
 8a
 08
@@ -2520,7 +2708,7 @@
 c3
 02
 82
-71
+a0
 68
 59
 01
@@ -2556,7 +2744,7 @@
 c0
 08
 02
-90
+bf
 58
 00
 57
@@ -2600,7 +2788,7 @@
 c0
 08
 02
-8d
+bc
 58
 00
 2b
@@ -2636,7 +2824,7 @@
 20
 20
 02
-89
+b8
 58
 00
 83
@@ -2648,7 +2836,7 @@
 20
 20
 02
-7e
+ad
 6f
 e0
 c3
@@ -2680,7 +2868,7 @@
 c5
 97
 82
-9f
+ce
 78
 3c
 fc
@@ -2724,7 +2912,7 @@
 20
 37
 02
-a8
+d7
 1b
 42
 04
@@ -2772,7 +2960,7 @@
 20
 40
 02
-b6
+e5
 6f
 e0
 81
@@ -2895,8 +3083,8 @@
 ad
 20
 40
-02
-dc
+03
+0b
 6f
 e0
 c0
@@ -3007,8 +3195,8 @@
 00
 20
 22
-82
-ef
+83
+1e
 e7
 e0
 80
@@ -3027,8 +3215,8 @@
 01
 c2
 00
-02
-e9
+03
+18
 1a
 42
 04
@@ -3164,11 +3352,11 @@
 c0
 00
 83
-16
+45
 c0
 01
 03
-1d
+4c
 20
 60
 00
@@ -3200,7 +3388,7 @@
 20
 20
 03
-23
+52
 58
 00
 03
@@ -3248,7 +3436,7 @@
 20
 40
 03
-05
+34
 6f
 f0
 8a
@@ -3284,7 +3472,7 @@
 20
 40
 03
-28
+57
 20
 40
 6f
@@ -3312,7 +3500,7 @@
 20
 40
 03
-28
+57
 6f
 e0
 c4
@@ -3344,7 +3532,7 @@
 20
 40
 03
-4a
+79
 68
 59
 01
@@ -3388,13 +3576,13 @@
 c3
 02
 83
-4a
+79
 20
 60
 00
 00
-bd
-54
+1c
+3b
 aa
 55
 40
@@ -3505,17 +3693,17 @@
 6b
 42
 0b
-4d
-69
-6e
-69
+41
+42
 20
 53
+68
+75
+74
+74
 65
-6c
-66
-69
-65
+72
+33
 aa
 55
 06
@@ -3810,7 +3998,7 @@
 aa
 aa
 55
-a9
+69
 5c
-fa
-19
+90
+4a
Index: output/ramcode.rom
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_adc_t20/output/ramcode.rom	(revision 4700)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_adc_t20/output/ramcode.rom	(working copy)
@@ -2,27 +2,27 @@
 c000001b
 c0010072
 c008807b
-c00a0277
+c00a02a6
 c00a8108
 c00c0116
 c00c80d5
 c00d008d
-c01282cb
-c01382c0
+c01282fa
+c01382ef
 c0588120
 c062811d
-c06d0260
-c06d82f4
-c06e0331
-c06e8312
+c06d028f
+c06d8323
+c06e0360
+c06e8341
 2020235a
-c0120299
+c01202c8
 c012806d
 c013005d
-c01c8293
+c01c82c2
 c01d001f
 c01f8046
-c0268297
+c02682c6
 c17f8000
 2020235a
 2435a002
@@ -174,12 +174,12 @@
 58557474
 67f18968
 7089606e
-20400232
-2040025d
+20400261
+2040028c
 204000b6
 7041480c
 20406f4e
-2020025f
+2020028e
 20758000
 37d98200
 6fe0c11c
@@ -297,7 +297,7 @@
 67e1451d
 58000064
 67e144f6
-204001d0
+204001ff
 5800000e
 67e144f2
 58000140
@@ -309,19 +309,19 @@
 67e444fa
 58000158
 67e143db
-58000220
+5800024f
 67e143dd
 5800638a
 67e143df
-58000170
+5800019f
 67e143e3
-58006365
+58000170
 67e14524
 5800015b
 67e143d5
 58006329
 67e143d7
-580001a1
+580001d0
 67e1451f
 58000156
 67e14521
@@ -339,7 +339,7 @@
 202063a1
 7044ecff
 70451c01
-202001a1
+202001d0
 7048d500
 2020639a
 dfe0000a
@@ -366,15 +366,62 @@
 20600000
 79200407
 20206edd
-204001df
-204001c1
-204001b4
-204001ac
-20400177
-2040017f
-20200190
+2040635d
+24760000
+1a227e00
+203a0177
+7048da00
+20404323
+20200181
+7048da01
+7048d900
+20404325
+da604556
+6fe0c8d9
+247a0000
+6fe0c8da
+243a0180
+7048d901
+20206371
+6fe0c8db
+79407e00
+67e0c8db
+c0000191
+c0008187
+20600000
+58000000
+67e1452e
+58000001
+67e14533
+58000601
+67e14556
+58000006
+67e1455b
+da60452e
+2020019b
+58000000
+67e1452e
+58000002
+67e14533
+58000602
+67e14556
+58000006
+67e1455b
+da60452e
+2020019b
+dfe00005
+98effe00
+9a60a600
+20206371
+2040020e
+204001f0
+204001e3
+204001db
+204001a6
+204001ae
+202001bf
 da6046ca
-da40017a
+da4001a9
 202042e0
 6fe144e9
 c284e39e
@@ -382,13 +429,13 @@
 7048d705
 20600000
 da6048d7
-da400182
+da4001b1
 202042e0
 6fe0c8d6
 1fe0fe01
 67e0c8d6
 1fe67c07
-2022818d
+202281bc
 7048d701
 6fe0c8d8
 79407e00
@@ -401,7 +448,7 @@
 6fe0c51c
 c1808000
 da6044f8
-da400195
+da4001c4
 202042e7
 6fe0c51c
 c1808000
@@ -427,7 +474,7 @@
 c3858000
 20204317
 da604518
-da4001af
+da4001de
 202042e7
 7048d500
 70451c02
@@ -439,8 +486,8 @@
 6fe0c8c5
 247a0000
 6fe144f8
-243a01be
-202001bb
+243a01ed
+202001ea
 6fe244fe
 67e246aa
 20204321
@@ -454,12 +501,12 @@
 6fe0c8d0
 6848c8d1
 98467c00
-202281cc
+202281fb
 da6048cc
-da4001d3
+da400202
 202042e0
 da6048d3
-da4001cf
+da4001fe
 202042e0
 7048d100
 6fe0c8d2
@@ -472,34 +519,34 @@
 6fe0c8ce
 79407e00
 67e0c8ce
-c00001de
-c00081dd
+c000020d
+c000820c
 20600000
 20204323
 20204325
 6fe0c8d5
 207a0000
-204001fa
+20400229
 24610000
 7048c400
 70440701
 20406ff3
 20406feb
-20400331
-20400312
+20400360
+20400341
 67e148c1
 da2048bb
-20400200
+2040022f
 6fe0c40c
-c30001f2
+c3000221
 7048c601
-202001f0
+2020021f
 7048c501
 20600000
 7048c500
 6fe144e9
-c28581f6
-204001de
+c2858225
+2040020d
 6fe0c8c6
 207a0000
 7048c600
@@ -524,11 +571,11 @@
 6fe10676
 68490670
 98467c00
-2021021c
+2021024b
 68490672
 98467e00
-2421021e
-203a021e
+2421024d
+203a024d
 1fefa264
 6fe10670
 68490672
@@ -543,16 +590,16 @@
 7048cb00
 20600000
 1a627e00
-c0188225
-c00a8227
-c01f822b
+c0188254
+c00a8256
+c01f825a
 202062da
 7048d401
 20600000
 7048d400
 204078ad
 7044f100
-202001a1
+202001d0
 7048d401
 204078ad
 7044f101
@@ -572,7 +619,7 @@
 708ac200
 708ac300
 d8e00006
-2040024f
+2040027e
 2a2ffe0d
 2040211d
 2a4ffe0d
@@ -580,14 +627,14 @@
 d8e00005
 2040211c
 2040211e
-2040024f
+2040027e
 d8a08ac2
 1a31fe00
 20402117
 1a51fe00
 20402117
 18e08fff
-20210244
+20210273
 2020214f
 2000003c
 58000f00
@@ -613,7 +660,7 @@
 6fe0c409
 67f080cd
 20000bb8
-20400270
+2040029f
 708a08c1
 6a40c419
 df200008
@@ -624,7 +671,7 @@
 20600000
 7080cc03
 6ff08129
-c3028271
+c30282a0
 68590164
 6049440a
 7080cc00
@@ -633,7 +680,7 @@
 708a8d12
 708a8e0a
 6fe0c099
-c0080290
+c00802bf
 58005762
 67f10907
 70890103
@@ -644,7 +691,7 @@
 708a8d44
 708a8e0a
 6fe0c099
-c008028d
+c00802bc
 58002bb1
 67f10907
 c6978000
@@ -653,10 +700,10 @@
 20600000
 58004189
 67f10907
-20200289
+202002b8
 58008312
 67f10907
-2020027e
+202002ad
 6fe0c334
 c1000000
 c001b04a
@@ -664,7 +711,7 @@
 793f8030
 20202af6
 204025c2
-c597829f
+c59782ce
 783cfc00
 2000001e
 204025c2
@@ -675,7 +722,7 @@
 78507c00
 19623600
 37c18400
-203702a8
+203702d7
 1b420400
 604b000f
 242c26fa
@@ -687,7 +734,7 @@
 984fb600
 20406877
 20372677
-204002b6
+204002e5
 6fe08168
 c301a677
 2055a477
@@ -718,7 +765,7 @@
 6fe240ad
 9840fe00
 67e240ad
-204002dc
+2040030b
 6fe0c0cb
 79207e04
 204023e1
@@ -746,12 +793,12 @@
 efe08011
 e8408013
 98467c00
-202282ef
+2022831e
 e7e08013
 37d98200
 1a20a201
 1a60a601
-c20002e9
+c2000318
 1a420400
 20600000
 6fe401fd
@@ -785,8 +832,8 @@
 67f08a0a
 20600000
 6fe0c407
-c0008316
-c001031d
+c0008345
+c001034c
 20600000
 580003e8
 67e14405
@@ -794,7 +841,7 @@
 6fe148b4
 da600e10
 20406fc0
-20200323
+20200352
 580003e8
 67e14405
 684948ae
@@ -806,7 +853,7 @@
 684948b8
 9846fc00
 20207d5f
-20400305
+20400334
 6ff08a09
 793ffe07
 67f08a09
@@ -815,14 +862,14 @@
 708a0d61
 708a0b00
 20600000
-20400328
+20400357
 20406f90
 6fe0c409
 67f080cd
 20406f97
 708a0d60
 7080cd00
-20400328
+20400357
 6fe0c409
 67f080cd
 708a0b50
@@ -830,7 +877,7 @@
 df00000b
 6de1440a
 7080cc03
-2040034a
+20400379
 68590164
 604948b8
 20406f9c
@@ -841,5 +888,5 @@
 7080cc00
 20600000
 6ff08129
-c302834a
+c3028379
 20600000
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_adc_t20/output/sched.rom	(revision 4700)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_adc_t20/output/sched.rom	(working copy)
@@ -71,7 +71,7 @@
 
 mem_le_lap:39 31 1f 98 07 2a
 mem_le_name_len:
-'Mini Selfie
+'AB Shutter3
 
 mem_shutter_key_conf0_temp:11 05 90 01 05
 # mem_shutter_key_conf0_temp:15 08 8c 01 05
Index: program/patch.prog
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_adc_t20/program/patch.prog	(revision 4700)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_adc_t20/program/patch.prog	(working copy)
@@ -407,7 +407,7 @@
 	setarg p_shutter_le_bb_event_timer
 	store 2,mem_cb_event_timer
 
-	setarg shutter_key_change
+	setarg p_shutter_key_change
 	store 2,mem_cb_shutter_keycan
 
 	setarg p_shutter_le_before_hibernate
@@ -480,72 +480,72 @@
 	set1 gpio_active_bit,temp
 	branch gpio_config_input
 
-// p_shutter_key_change:
-// 	call shutter_check_send_data
-// 	nrtn user2
-// 	deposit rega
-// 	branch p_shutter_key_release,blank
-// p_shutter_key_press:
-// 	jam 0,mem_shutter_release_flag
-// 	call app_led_on
-// 	branch p_le_get_release_ptr_volume
-
-// p_shutter_key_release:
-// 	jam 1,mem_shutter_release_flag
-// 	jam 0,mem_shutter_long_press_flag
-// 	call app_led_off
-// 	arg mem_key0_release,regc
+p_shutter_key_change:
+	call shutter_check_send_data
+	nrtn user2
+	deposit rega
+	branch p_shutter_key_release,blank
+p_shutter_key_press:
+	jam 0,mem_shutter_release_flag
+	call app_led_on
+	branch p_le_get_release_ptr_volume
+
+p_shutter_key_release:
+	jam 1,mem_shutter_release_flag
+	jam 0,mem_shutter_long_press_flag
+	call app_led_off
+	arg mem_key0_release,regc
 
-// //input:regc the address that want push to queue buffer
-// p_push_buffer_in_queue:
-// 	fetch 1,mem_shutter_long_press_flag
-// 	nrtn blank
-// p_push_buffer_in_queue_before:
-// 	fetch 1,mem_shutter_release_flag
-// 	nbranch p_push_buffer_in_queue_next,blank
-// 	jam 1,mem_shutter_long_press_flag
-// p_push_buffer_in_queue_next:
-// 	branch push_buffer_in_queue
-
-// p_le_get_release_ptr_volume:
-// 	fetch 1,mem_shutter_key_count
-// 	setflip 0,pdata
-// 	store 1,mem_shutter_key_count
-// 	beq 0,p_key_release_set_volume_dec
-// 	beq 1,p_key_release_set_volume_inc
-// 	rtn
-
-// 	p_key_release_set_volume_inc:
-// 	setarg 0x0000
-// 	store 2,mem_key0_press
-// 	setarg 0x0001
-// 	store 2,mem_key1_press
-// 	setarg 0x0601
-// 	store 2,mem_key0_release
-// 	setarg 0x0006
-// 	store 2,mem_key1_release
-
-// 	arg mem_key0_press,regc
-// 	branch p_push_queue_press_or_release
-
-// p_key_release_set_volume_dec:
-// 	setarg 0x0000
-// 	store 2,mem_key0_press
-// 	setarg 0x0002
-// 	store 2,mem_key1_press
-// 	setarg 0x0602
-// 	store 2,mem_key0_release
-// 	setarg 0x0006
-// 	store 2,mem_key1_release
-
-// 	arg mem_key0_press,regc
-// 	branch p_push_queue_press_or_release
-
-// p_push_queue_press_or_release:
-// 	arg MAX_QUEUE_NUM,pdata
-// 	imul32 queue,pdata
-// 	iadd regc,regc
-// 	branch push_buffer_in_queue
+//input:regc the address that want push to queue buffer
+p_push_buffer_in_queue:
+	fetch 1,mem_shutter_long_press_flag
+	nrtn blank
+p_push_buffer_in_queue_before:
+	fetch 1,mem_shutter_release_flag
+	nbranch p_push_buffer_in_queue_next,blank
+	jam 1,mem_shutter_long_press_flag
+p_push_buffer_in_queue_next:
+	branch push_buffer_in_queue
+
+p_le_get_release_ptr_volume:
+	fetch 1,mem_shutter_key_count
+	setflip 0,pdata
+	store 1,mem_shutter_key_count
+	beq 0,p_key_release_set_volume_dec
+	beq 1,p_key_release_set_volume_inc
+	rtn
+
+	p_key_release_set_volume_inc:
+	setarg 0x0000
+	store 2,mem_key0_press
+	setarg 0x0001
+	store 2,mem_key1_press
+	setarg 0x0601
+	store 2,mem_key0_release
+	setarg 0x0006
+	store 2,mem_key1_release
+
+	arg mem_key0_press,regc
+	branch p_push_queue_press_or_release
+
+p_key_release_set_volume_dec:
+	setarg 0x0000
+	store 2,mem_key0_press
+	setarg 0x0002
+	store 2,mem_key1_press
+	setarg 0x0602
+	store 2,mem_key0_release
+	setarg 0x0006
+	store 2,mem_key1_release
+
+	arg mem_key0_press,regc
+	branch p_push_queue_press_or_release
+
+p_push_queue_press_or_release:
+	arg MAX_QUEUE_NUM,pdata
+	imul32 queue,pdata
+	iadd regc,regc
+	branch push_buffer_in_queue
 
 p_shutter_le_bb_event_timer:
 ifdef ADC_1121SB
Index: sched/shutter.dat
===================================================================
--- /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_adc_t20/sched/shutter.dat	(revision 4700)
+++ /1121s/branch/shutter/branch/shutter/dq_project/dq_yc1386p_shutter_adc_t20/sched/shutter.dat	(working copy)
@@ -4,7 +4,7 @@
 
 mem_le_lap:39 31 1f 98 07 2a
 mem_le_name_len:
-'Mini Selfie
+'AB Shutter3
 
 mem_shutter_key_conf0_temp:11 05 90 01 05
 # mem_shutter_key_conf0_temp:15 08 8c 01 05