Index: output/otp.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/output/otp.dat	(revision 6444)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/output/otp.dat	(working copy)
@@ -11,112 +11,116 @@
 00
 aa
 55
-d6
-0a
+72
+0f
 c2
 84
 00
-15
+16
 c0
 00
-00
-1c
+01
+56
 c0
 01
-00
-b8
+01
+da
 c0
 08
-80
-c1
+81
+e3
 c0
 0a
-02
-74
+03
+9b
 c0
 0a
-81
-4d
+82
+74
 c0
 0c
-01
-5b
+02
+82
 c0
 0c
-81
-1a
+82
+41
 c0
 0d
-00
-d3
+01
+f5
 c0
 12
-82
-96
+83
+bd
 c0
 13
-80
-47
+81
+81
 c0
 51
 80
-5c
+4c
 c0
 52
-80
-a2
+81
+c4
 c0
 53
 00
-52
+1d
+c0
+53
+80
+27
 c0
 55
-00
-91
+01
+b3
 c0
 56
-00
-90
+01
+b2
 c0
 58
-81
-7a
+82
+a1
 c0
 62
-81
-62
+82
+89
 c0
 6d
-02
-45
+03
+6c
 c0
 6e
-02
-55
+03
+7c
 20
 20
 23
 5a
 c0
 12
-00
-20
+01
+5a
 c0
 12
-80
-79
+81
+9b
 c0
 13
-00
-7e
+01
+a0
 c0
 1c
-82
-90
+83
+b7
 c0
 26
-82
-94
+83
+bb
 c1
 7f
 80
@@ -125,262 +129,194 @@
 20
 23
 5a
-24
-35
-a0
-02
-37
-d9
-82
-00
-37
-d9
-82
-00
-20
-20
-20
-02
 20
 40
-25
-c2
-c5
-97
-80
-26
-78
-3c
-fc
 00
-20
+22
+6f
+e0
+ce
+c7
+c0
 00
+65
+a2
+c0
 00
-1e
+e5
+a5
 20
-40
-25
-c2
-19
-69
-96
-00
-78
-56
-fc
-00
-78
-26
-fc
-00
-78
-30
-fc
+60
 00
-78
-50
-7c
 00
-19
-62
-36
+18
+e2
+7e
 00
-37
-c1
-84
+c0
 00
+e7
+77
+c0
+01
+67
+65
+c0
+02
+67
+61
 20
-37
-00
-2f
-1b
-42
-04
-00
 60
-4b
-00
-0f
-24
-2c
-26
-fa
-78
-28
-7c
 00
-6f
-e0
-c1
-67
-d8
-40
-4e
-20
-98
-40
-84
 00
 6f
 e0
-c1
-48
-98
-4f
-b6
+ce
+c7
+c0
 00
+e5
+cf
 20
 40
-68
-77
-20
-37
-26
-77
+66
+28
 20
 40
 00
-3d
-6f
-e0
-81
-68
-c3
-01
-a6
-77
+2d
 20
-55
-a4
-77
+74
+00
+00
 20
 20
-26
-77
-68
-4b
+65
+cf
+d8
+e0
 00
-0f
-1b
-42
-7e
 00
-20
+da
 40
-7d
-12
-1f
-e2
-04
-00
-20
-40
-26
-ff
-1b
-42
-56
-00
-1d
-22
-7e
+4a
+c3
+df
+e0
 00
+02
 98
-40
+ef
 fe
 00
-1f
-e2
-52
+9a
+40
+a4
+00
+ef
+e1
 00
+12
 20
-60
+7a
 00
 00
-c5
-84
-a4
-89
 68
-4a
-40
-ad
-df
-e0
+49
 06
-00
+f1
 98
-46
-7c
+42
+fc
 00
 20
-61
-00
-00
-18
-42
 22
+80
+39
+18
+e0
+8e
+01
+20
+20
 00
-68
-4b
+2e
+67
+e1
+4a
+cf
+20
+40
+43
+23
+da
+60
+4a
+d1
+df
+e0
 00
-0f
-1d
-62
-7e
+0a
+98
+ef
+fe
+00
+9a
+60
+a6
 00
 20
 40
-7d
-10
-1a
-22
-04
 00
+71
 20
 20
-24
-7d
-20
-40
-00
-57
+66
+33
 6f
-e0
-ce
-c7
-c0
-00
-65
-a2
-c0
-00
-e5
-a5
+e1
+4a
+cf
 20
-60
+7a
 00
 00
+68
+49
+06
+f1
 18
-e2
-7e
+46
+7c
 00
-c0
+20
+22
+80
+47
+20
+20
 00
-e7
-77
+46
+70
+4e
 c0
 01
-67
-65
-c0
-02
-67
-61
 20
+40
+43
+25
+da
 60
+4b
+0d
+20
+40
 00
-00
+71
+20
+20
+66
+39
 6f
 e0
 cf
@@ -423,99 +359,1323 @@
 00
 24
 42
-80
-6f
+81
+91
 6f
 e0
 ce
 c9
 24
 5a
-00
-6a
-20
-20
-65
-15
+01
+8c
 18
 e2
 7e
 00
-c0
-03
-00
-6d
-20
-60
-00
-00
-70
-4e
-c9
+67
+e0
+ce
+c5
+68
+48
+ce
+c8
+98
+46
+7c
 00
 20
-20
-43
-25
+22
+80
+61
 6f
 e0
 ce
 c9
-20
+24
 3a
 00
-72
+63
 20
 20
 65
-29
+1c
+70
+4e
+c6
+01
 20
-40
-67
-30
 20
-3a
 00
 75
 20
-20
-64
-c5
+40
+67
+7f
 18
 e2
 7e
 00
-2f
-e0
-0e
-01
-24
-60
-80
+c0
 00
-20
-20
-64
-cd
+e5
+1c
 20
 40
-28
-1c
-6a
+00
+7a
 20
-80
-4d
-1a
 20
-a3
-fc
-24
-21
-26
-fa
+00
+75
 20
+40
+68
+21
 20
-26
+40
+67
+30
+20
+3a
+00
+6c
+20
+20
+68
+12
+6f
+e1
+4f
+74
+67
+e1
+4e
+ae
+6f
+e1
+4f
+76
+67
+e1
+4e
+b0
+20
+20
+67
+be
+20
+40
+67
+7f
+ef
+e0
+80
+13
+20
+7a
+00
+00
+20
+40
+00
+7a
+20
+40
+00
+bd
+20
+40
+67
+30
+24
+3a
+00
+8c
+df
+e0
+00
+35
+20
+20
+63
+82
+6f
+e0
+ce
+c7
+c0
+00
+80
+7e
+c0
+00
+00
+84
+20
+60
+00
+00
+18
+e2
+7e
+00
+c0
+02
+80
+c7
+c0
+00
+00
+d8
+c0
+02
+00
+e0
+c0
+01
+00
+fe
+20
+60
+00
+00
+ef
+e0
+80
+13
+c0
+00
+80
+c7
+c0
+01
+00
+d8
+c0
+01
+80
+e0
+c0
+02
+00
+fe
+c0
+02
+80
+8b
+20
+60
+00
+00
+20
+20
+01
+3f
+20
+40
+00
+94
+20
+40
+00
+a9
+20
+40
+00
+b3
+df
+e0
+00
+05
+20
+40
+63
+82
+70
+49
+e5
+3c
+df
+e0
+00
+06
+20
+20
+63
+82
+20
+40
+00
+9f
+18
+42
+7e
+00
+20
+7a
+00
+00
+67
+e0
+ce
+b3
+df
+e0
+00
+11
+20
+40
+63
+82
+6f
+e0
+ce
+b3
+1f
+e0
+ff
+ff
+67
+e0
+ce
+b3
+20
+7a
+00
+00
+20
+20
+00
+98
+68
+48
+ce
+aa
+20
+40
+67
+30
+20
+7a
+00
+00
+68
+48
+ce
+ad
+18
+40
+84
+01
+6f
+e0
+ce
+c6
+20
+7a
+00
+00
+68
+48
+ce
+aa
+70
+4e
+c6
+00
+20
+60
+00
+00
+6f
+e0
+ce
+ac
+20
+7a
+00
+00
+67
+e0
+ce
+b4
+df
+e0
+00
+16
+20
+40
+63
+82
+6f
+e0
+ce
+b4
+1f
+e0
+ff
+ff
+67
+e0
+ce
+b4
+20
+7a
+00
+00
+20
+20
+00
+ac
+6f
+e0
+ce
+ad
+20
+7a
+00
+00
+67
+e0
+ce
+b5
+df
+e0
+00
+17
+20
+40
+63
+82
+6f
+e0
+ce
+b5
+1f
+e0
+ff
+ff
+67
+e0
+ce
+b5
+20
+7a
+00
+00
+20
+20
+00
+b6
+6f
+e0
+ce
+ab
+24
+7a
+00
+00
+70
+4e
+ab
+01
+20
+20
+00
+ce
+6f
+e0
+ce
+ac
+20
+7a
+00
+00
+1f
+e0
+ff
+ff
+67
+e0
+ce
+ac
+df
+e0
+00
+62
+20
+60
+00
+00
+20
+40
+01
+1e
+6f
+e1
+4e
+ae
+98
+46
+7c
+00
+24
+41
+00
+c1
+24
+61
+00
+00
+98
+46
+7e
+00
+67
+e1
+4e
+ae
+20
+40
+67
+30
+20
+3a
+01
+2e
+6f
+e1
+4e
+ae
+68
+49
+4e
+b0
+18
+4d
+04
+00
+18
+52
+04
+00
+98
+40
+fe
+00
+67
+e1
+cb
+17
+20
+40
+01
+35
+20
+20
+01
+3f
+20
+40
+67
+30
+24
+5a
+01
+23
+20
+40
+01
+1e
+6f
+e1
+4e
+ae
+98
+40
+fe
+00
+d8
+40
+0f
+ff
+20
+40
+7d
+6c
+20
+20
+00
+cd
+20
+40
+67
+30
+20
+3a
+00
+f7
+20
+40
+01
+1e
+6f
+e1
+4e
+b0
+98
+46
+7e
+00
+67
+e1
+4e
+b0
+68
+49
+4e
+b0
+58
+00
+0f
+ff
+98
+46
+7e
+00
+d8
+40
+00
+62
+98
+46
+04
+00
+24
+21
+00
+ce
+58
+00
+0f
+ff
+98
+46
+7e
+00
+68
+48
+ce
+ad
+18
+46
+7c
+05
+20
+22
+80
+f4
+18
+40
+84
+01
+60
+48
+ce
+ad
+20
+20
+01
+17
+70
+4e
+ad
+00
+58
+00
+0f
+ff
+20
+20
+01
+17
+20
+40
+01
+1e
+6f
+e1
+4e
+b0
+98
+46
+7c
+00
+24
+61
+00
+00
+98
+46
+7e
+00
+67
+e1
+4e
+b0
+20
+20
+00
+ce
+20
+40
+67
+30
+20
+3a
+01
+07
+20
+40
+01
+1e
+6f
+e1
+4e
+b0
+98
+40
+fe
+00
+d8
+40
+0f
+ff
+98
+46
+22
+00
+20
+21
+01
+0d
+20
+20
+01
+17
+20
+40
+01
+1e
+6f
+e1
+4e
+b0
+98
+40
+fe
+00
+d8
+40
+0f
+ff
+20
+40
+7d
+6c
+20
+20
+01
+17
+20
+40
+67
+30
+20
+3a
+01
+19
+6f
+e0
+ce
+ad
+20
+3a
+01
+19
+1f
+e0
+ff
+ff
+67
+e0
+ce
+ad
+58
+00
+0f
+ff
+d8
+40
+00
+62
+98
+46
+7e
+00
+9a
+20
+fe
+00
+67
+e1
+4e
+b0
+20
+20
+00
+ce
+58
+00
+0f
+ff
+20
+20
+01
+17
+70
+4e
+ac
+00
+df
+e0
+00
+00
+20
+20
+00
+cd
+d8
+40
+00
+0a
+20
+40
+67
+30
+20
+7a
+00
+00
+d8
+40
+00
+07
+20
+60
+00
+00
+6f
+e1
+4e
+ae
+d8
+40
+00
+62
+98
+46
+04
+00
+24
+61
+00
+00
+18
+42
+7e
+00
+68
+48
+ce
+ac
+18
+46
+7c
+03
+20
+22
+81
+1b
+18
+40
+84
+01
+60
+48
+ce
+ac
+20
+20
+00
+cd
+6f
+e1
+4e
+ae
+68
+49
+4e
+b0
+18
+50
+04
+00
+98
+40
+fe
+00
+67
+e2
+4b
+17
+20
+40
+01
+35
+20
+20
+01
+3f
+20
+40
+67
+30
+24
+3a
+01
+49
+58
+00
+00
+17
+1f
+ef
+fe
+0a
+d8
+40
+4c
+02
+98
+40
+8a
+00
+18
+a0
+8a
+04
+6f
+e2
+4b
+17
+e7
+e2
+00
+05
+20
+20
+67
+be
+20
+40
+67
+30
+24
+3a
+01
+49
+58
+00
+00
+34
+1f
+ef
+fe
+0a
+d8
+40
+4c
+02
+98
+40
+8a
+00
+18
+a0
+8a
+04
+6f
+e2
+4b
+17
+e7
+e2
+00
+05
+20
+60
+00
+00
+58
+00
+00
+04
+1f
+ef
+fe
+0a
+d8
+40
+4c
+02
+98
+40
+8a
+00
+18
+a0
+8a
+03
+6f
+e1
+4e
+ae
+e7
+e1
+80
+05
+18
+a0
+8a
+07
+6f
+e1
+4e
+b0
+1f
+f2
+7e
+00
+1f
+ed
+7e
+00
+e7
+e1
+80
+05
+20
+20
+67
+be
+24
+35
+a0
+02
+37
+d9
+82
+00
+37
+d9
+82
+00
+20
+20
+20
+02
+20
+40
+25
+c2
+c5
+97
+81
+60
+78
+3c
+fc
+00
+20
+00
+00
+1e
+20
+40
+25
+c2
+19
+69
+96
+00
+78
+56
+fc
+00
+78
+26
+fc
+00
+78
+30
+fc
+00
+78
+50
+7c
+00
+19
+62
+36
+00
+37
+c1
+84
+00
+20
+37
+01
+69
+1b
+42
+04
+00
+60
+4b
+00
+0f
+24
+2c
+26
+fa
+78
+28
+7c
+00
+6f
+e0
+c1
+67
+d8
+40
+4e
+20
+98
+40
+84
+00
+6f
+e0
+c1
+48
+98
+4f
+b6
+00
+20
+40
+68
+77
+20
+37
+26
+77
+20
+40
+01
+77
+6f
+e0
+81
+68
+c3
+01
+a6
+77
+20
+55
+a4
+77
+20
+20
+26
+77
+68
+4b
+00
+0f
+1b
+42
+7e
+00
+20
+40
+7d
+12
+1f
+e2
+04
+00
+20
+40
+26
+ff
+1b
+42
+56
+00
+1d
+22
+7e
+00
+98
+40
+fe
+00
+1f
+e2
+52
+00
+20
+60
+00
+00
+c5
+84
+a4
+89
+68
+4a
+40
+ad
+df
+e0
+06
+00
+98
+46
+7c
+00
+20
+61
+00
+00
+18
+42
+22
+00
+68
+4b
+00
+0f
+1d
+62
+7e
+00
+20
+40
+7d
+10
+1a
+22
+04
+00
+20
+20
+24
+7d
+18
+e2
+7e
+00
+c0
+03
+01
+8f
+20
+60
+00
+00
+70
+4e
+c9
+00
+20
+20
+43
+25
+6f
+e0
+ce
+c9
+20
+3a
+01
+94
+20
+20
+65
+29
+20
+40
+67
+30
+20
+3a
+01
+97
+20
+20
+64
+c5
+18
+e2
+7e
+00
+2f
+e0
+0e
+01
+24
+60
+80
+00
+20
+20
+64
+cd
+20
+40
+28
+1c
+6a
+20
+80
+4d
+1a
+20
+a3
+fc
+24
+21
+26
+fa
+20
+20
+26
 8e
 09
 80
@@ -611,8 +1771,8 @@
 04
 c0
 00
-80
-97
+81
+b9
 20
 20
 66
@@ -627,16 +1787,16 @@
 06
 c0
 03
-00
-9b
+01
+bd
 20
 60
 00
 00
 20
 40
-00
-9d
+01
+bf
 20
 20
 67
@@ -719,8 +1879,8 @@
 06
 24
 3a
-00
-b2
+01
+d4
 20
 20
 65
@@ -783,8 +1943,8 @@
 8c
 20
 20
-00
-b8
+01
+da
 70
 8a
 0f
@@ -899,8 +2059,8 @@
 fe
 20
 40
-01
-22
+02
+49
 6f
 e0
 c4
@@ -911,8 +2071,8 @@
 d7
 24
 55
-80
-cf
+81
+f1
 37
 d9
 82
@@ -927,8 +2087,8 @@
 99
 c0
 08
-01
-0f
+02
+36
 6f
 e0
 c4
@@ -971,8 +2131,8 @@
 3b
 20
 40
-01
-01
+02
+28
 70
 80
 43
@@ -995,16 +2155,36 @@
 6e
 20
 40
-02
-17
+03
+3e
 20
 40
-02
-42
+03
+69
 20
 40
-00
-fb
+02
+22
+70
+8a
+30
+06
+70
+8a
+32
+dd
+70
+8a
+88
+e0
+70
+8a
+8c
+2d
+70
+8a
+31
+78
 70
 41
 48
@@ -1015,8 +2195,8 @@
 4e
 20
 20
-02
-44
+03
+6b
 20
 75
 80
@@ -1047,8 +2227,8 @@
 99
 c0
 0c
-01
-07
+02
+2e
 6f
 e0
 c4
@@ -1139,16 +2319,16 @@
 04
 20
 20
-00
-ed
+02
+0f
 6f
 e0
 c1
 41
 c0
 05
-01
-1d
+02
+44
 20
 20
 22
@@ -1175,8 +2355,8 @@
 00
 20
 35
-81
-49
+82
+70
 6f
 e2
 02
@@ -1343,8 +2523,8 @@
 0f
 20
 20
-01
-33
+02
+5a
 20
 40
 68
@@ -1451,8 +2631,8 @@
 ff
 20
 40
-01
-6a
+02
+91
 20
 40
 70
@@ -1495,24 +2675,24 @@
 00
 20
 22
-81
-75
+82
+9c
 1f
 e2
 04
 00
 20
 40
-01
-78
+02
+9f
 1a
 20
 a2
 01
 c2
 00
-01
-6f
+02
+96
 20
 60
 00
@@ -1533,6 +2713,10 @@
 75
 80
 00
+20
+40
+42
+a3
 70
 40
 a6
@@ -1547,24 +2731,24 @@
 59
 58
 00
-01
-d3
+02
+fb
 67
 e1
 43
 db
 58
 00
-01
-b0
+02
+d8
 67
 e1
 43
 dd
 58
 00
-01
-c5
+02
+ed
 67
 e1
 43
@@ -1579,8 +2763,8 @@
 d3
 58
 00
-01
-65
+02
+8c
 67
 e1
 43
@@ -1595,8 +2779,8 @@
 d7
 58
 00
-01
-a9
+02
+d1
 67
 e1
 43
@@ -1611,8 +2795,8 @@
 24
 20
 40
-01
-95
+02
+bd
 20
 20
 64
@@ -1635,8 +2819,8 @@
 d7
 58
 00
-01
-9f
+02
+c7
 67
 e1
 45
@@ -1683,8 +2867,8 @@
 00
 20
 40
-01
-a3
+02
+cb
 20
 20
 63
@@ -1747,24 +2931,24 @@
 00
 c0
 0a
-01
-b7
+02
+df
 c0
 0a
-81
-b5
+82
+dd
 c0
 20
-01
-bc
+02
+e4
 20
 20
 64
 e0
 20
 40
-01
-a3
+02
+cb
 20
 20
 64
@@ -1779,8 +2963,8 @@
 e6
 20
 40
-01
-a6
+02
+ce
 20
 40
 67
@@ -1811,8 +2995,8 @@
 30
 24
 3a
-01
-d0
+02
+f8
 6f
 e4
 4f
@@ -1831,8 +3015,8 @@
 98
 c0
 12
-01
-c8
+02
+f0
 20
 60
 00
@@ -1855,8 +3039,8 @@
 2b
 24
 3a
-01
-d0
+02
+f8
 6f
 e4
 4f
@@ -1919,8 +3103,8 @@
 1b
 20
 20
-01
-dd
+03
+05
 6f
 e1
 48
@@ -1983,8 +3167,8 @@
 7a
 20
 40
-01
-fa
+03
+22
 6f
 e1
 06
@@ -2031,8 +3215,8 @@
 00
 c2
 00
-01
-e6
+03
+0e
 20
 60
 00
@@ -2075,8 +3259,8 @@
 00
 20
 20
-02
-04
+03
+2c
 1a
 60
 8c
@@ -2087,8 +3271,8 @@
 06
 20
 20
-02
-07
+03
+2f
 20
 40
 65
@@ -2111,8 +3295,8 @@
 00
 20
 40
-02
-0e
+03
+36
 20
 20
 65
@@ -2121,6 +3305,10 @@
 60
 4a
 30
+70
+49
+e5
+1e
 20
 40
 67
@@ -2140,15 +3328,7 @@
 70
 49
 e5
-78
-c1
-00
-80
-00
-70
-49
-e5
-e6
+3c
 20
 60
 00
@@ -2203,8 +3383,8 @@
 06
 20
 40
-02
-34
+03
+5b
 2a
 2f
 fe
@@ -2235,8 +3415,8 @@
 1e
 20
 40
-02
-34
+03
+5b
 d8
 a0
 8a
@@ -2263,8 +3443,8 @@
 ff
 20
 21
-02
-29
+03
+50
 20
 20
 21
@@ -2367,8 +3547,8 @@
 b8
 20
 40
-02
-6d
+03
+94
 70
 8a
 08
@@ -2403,8 +3583,8 @@
 00
 20
 40
-02
-63
+03
+8a
 6f
 f0
 8a
@@ -2447,8 +3627,8 @@
 b8
 20
 40
-02
-6d
+03
+94
 70
 80
 cd
@@ -2507,8 +3687,8 @@
 29
 c3
 02
-82
-6e
+83
+95
 68
 59
 01
@@ -2543,8 +3723,8 @@
 99
 c0
 08
-02
-8d
+03
+b4
 58
 00
 57
@@ -2587,8 +3767,8 @@
 99
 c0
 08
-02
-8a
+03
+b1
 58
 00
 2b
@@ -2623,8 +3803,8 @@
 07
 20
 20
-02
-86
+03
+ad
 58
 00
 83
@@ -2635,8 +3815,8 @@
 07
 20
 20
-02
-7b
+03
+a2
 6f
 e0
 c3
@@ -2683,8 +3863,8 @@
 ad
 20
 40
-02
-9d
+03
+c4
 20
 20
 24
@@ -2755,8 +3935,8 @@
 00
 20
 22
-82
-b0
+83
+d7
 e7
 e0
 80
@@ -2775,8 +3955,8 @@
 01
 c2
 00
-02
-aa
+03
+d1
 1a
 42
 04
@@ -2785,8 +3965,8 @@
 60
 00
 00
-8a
-12
+60
+e6
 aa
 55
 40
@@ -2813,7 +3993,7 @@
 00
 00
 00
-68
+e8
 14
 02
 00
@@ -3045,52 +4225,31 @@
 00
 aa
 55
-07
+01
 00
 b6
 4e
-15
-15
-1a
-16
-12
-12
 00
 aa
 55
-07
+01
 00
 cf
 4e
-15
-15
-1a
-39
-12
-12
 00
 aa
 55
-06
+01
 00
 d9
 4e
-15
-15
-1a
-3a
-12
-12
+00
 aa
 55
-05
+01
 00
 ca
 4e
-13
-38
-12
-12
 00
 aa
 55
@@ -3101,42 +4260,35 @@
 00
 aa
 55
-0d
+0a
 00
 57
 4b
-0e
-11
-11
-12
-2c
-2e
-2f
-30
-32
-33
-0f
-0f
-00
+22
+23
+24
+25
+26
+27
+28
+29
+2a
+2b
 aa
 55
 03
 00
 c0
 4b
-3c
-37
+33
+09
 00
 aa
 55
-05
+01
 00
 25
 4b
-0e
-2a
-12
-2b
 00
 aa
 55
@@ -3144,21 +4296,19 @@
 00
 66
 4b
-12
-12
+1c
+2c
 00
 aa
 55
-07
+05
 00
 97
 4f
-0e
-12
-12
-0e
-12
-12
+1c
+2c
+1c
+2c
 00
 aa
 55
@@ -3169,23 +4319,19 @@
 00
 aa
 55
-0d
+09
 00
 75
 4b
-0e
-14
-14
-14
-12
-22
-23
-24
-25
-17
-17
-17
-00
+20
+1f
+1e
+1d
+1c
+1b
+1a
+19
+21
 aa
 55
 01
@@ -3220,24 +4366,19 @@
 00
 aa
 55
-0e
+09
 00
 93
 4b
-0e
-17
-17
-17
-12
-29
-26
-25
-24
-23
-14
-14
-14
-00
+19
+1a
+1b
+1c
+1d
+1e
+1f
+20
+21
 aa
 55
 01
@@ -3247,55 +4388,46 @@
 00
 aa
 55
-0d
+0a
 00
 a2
 4b
-0e
-0f
-0f
-12
-32
-31
-2f
-2e
-2c
-35
-11
-11
-00
+2b
+2a
+29
+28
+27
+26
+25
+24
+23
+22
 aa
 55
 03
 00
 cf
 4b
-36
-37
+32
+09
 00
 aa
 55
-06
-00
-b1
-4b
-0e
-2a
-12
-2b
-12
+03
+00
+b1
+4b
+0a
+0b
 00
 aa
 55
-06
+03
 00
 8a
 4a
-0e
-12
-12
-12
-12
+18
+35
 00
 aa
 55
@@ -3306,27 +4438,31 @@
 00
 aa
 55
-08
+09
 00
 30
 4a
-10
-0b
-0e
-1d
-1d
-1d
-12
+23
+24
+25
+26
+27
+28
+29
+2a
+2b
+aa
+55
+00
 00
+99
+4a
 aa
 55
-04
+01
 00
 1e
 4f
-0e
-12
-12
 00
 aa
 55
@@ -3334,22 +4470,19 @@
 00
 3f
 4a
-12
-12
+1c
+2c
 00
 aa
 55
-08
+05
 00
 8f
 4f
-0e
-12
-12
-0e
-12
-12
-12
+1c
+2c
+1c
+2c
 00
 aa
 55
@@ -3360,22 +4493,19 @@
 00
 aa
 55
-0c
+09
 00
 4e
 4a
-13
-18
-0e
+20
+1f
 1e
-0c
-0c
-0c
-0c
-12
-13
-18
-00
+1d
+1c
+1b
+1a
+19
+21
 aa
 55
 03
@@ -3426,21 +4556,19 @@
 00
 aa
 55
-0b
+09
 00
 6c
 4a
-15
-19
-0e
-0d
-0d
-0d
-0d
-12
-15
 19
-00
+1a
+1b
+1c
+1d
+1e
+1f
+20
+21
 aa
 55
 03
@@ -3470,23 +4598,23 @@
 00
 7b
 4a
-15
-0a
-0e
-1c
-1c
-1c
-12
-12
-00
+2a
+29
+28
+27
+26
+25
+24
+23
+22
 aa
 55
 03
 00
 a8
 4a
-36
-37
+32
+09
 00
 aa
 55
@@ -3636,21 +4764,21 @@
 00
 00
 03
-1f
+17
+00
+01
+00
 00
-28
-f0
-15
 00
 00
 00
 00
 03
-1f
+17
+00
+00
+00
 00
-ae
-ff
-15
 00
 00
 00
@@ -3659,8 +4787,8 @@
 1f
 00
 00
-e0
-f9
+00
+00
 00
 00
 00
@@ -3668,18 +4796,18 @@
 03
 1f
 00
+27
 00
 00
-0a
 00
 00
 00
 00
 03
-17
-00
-01
+1f
 00
+d8
+0f
 00
 00
 00
@@ -3688,9 +4816,9 @@
 03
 1f
 00
-27
-00
 00
+c0
+03
 00
 00
 00
@@ -3698,9 +4826,9 @@
 03
 1f
 00
-ff
-17
-80
+00
+40
+fc
 00
 00
 00
@@ -3708,19 +4836,29 @@
 03
 1f
 00
-d8
-0f
-00
+01
+f8
+7f
 00
 00
 00
 00
 03
-17
+1f
+00
+01
+18
+80
+00
 00
 00
 00
+03
+1f
+00
 00
+10
+80
 00
 00
 00
@@ -3728,9 +4866,9 @@
 03
 1f
 00
-01
-f8
-7f
+3c
+00
+0e
 00
 00
 00
@@ -3738,9 +4876,9 @@
 03
 1f
 00
+02
+30
 00
-40
-fc
 00
 00
 00
@@ -3748,9 +4886,9 @@
 03
 1f
 00
-01
-18
-80
+64
+00
+00
 00
 00
 00
@@ -3758,109 +4896,229 @@
 03
 1f
 00
-3c
-40
-13
 00
+b0
+f9
+00
+00
+00
+00
+05
+23
+00
+07
+00
+00
+00
+00
+00
+00
+05
+23
+00
+07
+f0
+04
+f0
+02
+00
+00
+05
+23
+00
+07
+f0
+04
+1c
+04
+00
+00
+05
+23
+00
+07
+f0
+04
+48
+05
+00
+00
+05
+23
+00
+07
+f0
+04
+74
+06
+00
+00
+05
+23
 00
+07
+f0
+04
+a0
+07
 00
 00
-03
-1f
+05
+23
 00
+07
+f0
+04
+cc
+08
 00
-c0
-03
 00
+05
+23
 00
+07
+f0
+04
+f8
+09
 00
 00
-03
-1f
+05
+23
 00
-6c
-40
+07
 f0
+04
+24
+0b
 00
 00
+05
+23
 00
 00
-03
-1f
+f0
+04
+24
+0b
 00
-6c
-80
-0a
 00
+05
+23
 00
 00
+f0
+07
+60
+06
+00
 00
-03
-1f
+05
+23
 00
+07
+a3
+06
+50
+06
 00
-10
-80
 00
+05
+23
 00
+07
+66
+05
+50
+06
 00
 00
-03
-1f
+05
+23
 00
-3c
-80
 07
+2c
+04
+60
+06
 00
 00
+05
+23
 00
-00
+07
+02
 03
-1f
-00
-96
+50
+06
 00
 00
+05
+23
 00
+07
+e2
+02
+50
+06
 00
 00
+05
+23
 00
-03
-1f
+07
+44
+02
+60
+06
 00
-6a
-0f
 00
+05
+23
 00
+07
+73
+01
+50
+06
 00
 00
+05
+23
 00
+07
 03
-1f
-00
-02
-d0
-ff
+01
+50
+06
 00
 00
+05
+23
 00
 00
-03
-1f
+01
 00
-02
-30
+60
+06
 00
 00
+05
+23
 00
+04
+f4
+01
+cc
+01
 00
 00
 03
 1f
 00
-64
-00
-00
+3c
+40
+07
 00
 00
 00
@@ -3868,225 +5126,85 @@
 03
 1f
 00
-00
-b0
-f9
+41
+40
+0b
 00
 00
 00
 00
-07
-13
+02
+27
 00
-07
-06
-70
-07
-ac
-0d
-01
-07
-13
+30
 00
-07
-06
-70
-07
-80
-0c
-01
-07
-13
 00
-07
-06
-70
-07
-54
-0b
-01
-07
-13
 00
-07
-06
-70
-07
-28
-0a
-01
-07
-13
 00
-07
-06
-70
-07
-fc
-08
-01
-07
-13
 00
-07
-06
-70
-07
-d0
-07
-01
-07
-13
 00
-07
-06
-70
-07
-a4
-06
-01
-07
-13
+02
+27
 00
 00
-06
-70
-07
-78
-05
 00
-07
-13
 00
-07
-07
-70
-07
-70
-07
-01
-07
-13
 00
 00
-07
-70
-07
-70
-07
 00
-07
-13
 00
-07
-05
-10
-0c
-70
-04
-01
-07
-13
+03
+1f
 00
-07
-05
-48
-0b
-70
-04
-01
-07
-13
 00
-07
-05
 f0
-0a
-70
-04
-01
-07
-13
+7f
 00
-07
-05
-c4
-09
-70
-04
-01
-07
-13
 00
-07
-05
-6c
-07
-70
-04
-01
-07
-13
 00
-07
-05
-40
-04
-70
-04
-01
-07
-13
 00
-07
-05
-e8
 02
-70
+1b
+00
 04
-01
-07
-13
 00
 00
-05
+00
+00
+00
 00
 02
-70
-04
+1b
 00
-07
-13
+08
 00
 00
-06
-70
-07
-ac
-0e
 00
-07
-13
 00
 00
-05
-10
-0d
-70
-04
 00
 02
 1b
 00
-04
+10
 00
 00
 00
 00
 00
 00
-02
-1b
+05
+23
+00
+06
+00
+00
+00
+00
+00
+00
+05
+23
 00
 00
 00
@@ -4098,9 +5216,9 @@
 03
 1f
 00
-a0
-30
-e8
+00
+40
+00
 00
 00
 00
@@ -4110,7 +5228,7 @@
 00
 3c
 40
-07
+04
 00
 00
 00
@@ -4118,33 +5236,43 @@
 03
 1f
 00
-41
+3c
 40
-0b
-00
+15
 00
 00
 00
-02
-1b
 00
-10
+03
+1f
 00
 00
+10
+80
 00
 00
 00
 00
-02
-1b
+03
+1f
 00
-08
 00
+c0
+ff
 00
 00
 00
 00
+07
+13
 00
+07
+06
+70
+07
+ac
+0d
+01
 aa
 55
 03
@@ -4184,7 +5312,7 @@
 01
 aa
 55
-9a
+97
 01
 d2
 46
@@ -4481,13 +5609,16 @@
 03
 28
 01
-12
+10
 23
 00
 02
 4d
 2a
-02
+05
+00
+00
+00
 00
 00
 24
@@ -4504,7 +5635,7 @@
 08
 29
 02
-02
+06
 01
 26
 00
@@ -4518,13 +5649,7 @@
 02
 4d
 2a
-08
-00
-00
-00
-00
-00
-00
+02
 00
 00
 28
@@ -4541,7 +5666,7 @@
 08
 29
 02
-06
+02
 01
 2a
 00
@@ -4604,17 +5729,80 @@
 00
 d0
 49
-72
-00
-c9
+76
 00
+21
+01
 aa
 55
-c9
-00
+21
+01
 ae
 48
 05
+0d
+09
+01
+a1
+01
+85
+06
+09
+22
+a1
+02
+09
+42
+15
+00
+25
+01
+75
+01
+95
+01
+81
+02
+09
+32
+81
+02
+95
+06
+81
+03
+05
+01
+26
+ff
+0f
+75
+10
+95
+01
+55
+0e
+65
+33
+09
+30
+35
+00
+46
+b5
+04
+81
+02
+09
+31
+46
+8a
+03
+81
+02
+c0
+c0
+05
 0c
 09
 01
@@ -4645,6 +5833,31 @@
 06
 c0
 05
+0c
+09
+01
+a1
+01
+85
+02
+19
+00
+2a
+ff
+03
+15
+00
+26
+ff
+03
+95
+01
+75
+10
+81
+00
+c0
+05
 01
 09
 02
@@ -5029,7 +6242,7 @@
 aa
 aa
 55
-8d
-57
-99
-bd
+a6
+66
+14
+ba
Index: output/ramcode.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/output/ramcode.rom	(revision 6444)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/output/ramcode.rom	(working copy)
@@ -1,37 +1,351 @@
-c2840015
-c000001c
-c00100b8
-c00880c1
-c00a0274
-c00a814d
-c00c015b
-c00c811a
-c00d00d3
-c0128296
-c0138047
-c051805c
-c05280a2
-c0530052
-c0550091
-c0560090
-c058817a
-c0628162
-c06d0245
-c06e0255
+c2840016
+c0000156
+c00101da
+c00881e3
+c00a039b
+c00a8274
+c00c0282
+c00c8241
+c00d01f5
+c01283bd
+c0138181
+c051804c
+c05281c4
+c053001d
+c0538027
+c05501b3
+c05601b2
+c05882a1
+c0628289
+c06d036c
+c06e037c
 2020235a
-c0120020
-c0128079
-c013007e
-c01c8290
-c0268294
+c012015a
+c012819b
+c01301a0
+c01c83b7
+c02683bb
 c17f8000
 2020235a
+20400022
+6fe0cec7
+c00065a2
+c000e5a5
+20600000
+18e27e00
+c000e777
+c0016765
+c0026761
+20600000
+6fe0cec7
+c000e5cf
+20406628
+2040002d
+20740000
+202065cf
+d8e00000
+da404ac3
+dfe00002
+98effe00
+9a40a400
+efe10012
+207a0000
+684906f1
+9842fc00
+20228039
+18e08e01
+2020002e
+67e14acf
+20404323
+da604ad1
+dfe0000a
+98effe00
+9a60a600
+20400071
+20206633
+6fe14acf
+207a0000
+684906f1
+18467c00
+20228047
+20200046
+704ec001
+20404325
+da604b0d
+20400071
+20206639
+6fe0cf9f
+243a6502
+704c0001
+20404323
+2040652c
+20406561
+20216500
+18e27e00
+6848cec5
+98467c00
+24428191
+6fe0cec9
+245a018c
+18e27e00
+67e0cec5
+6848cec8
+98467c00
+20228061
+6fe0cec9
+243a0063
+2020651c
+704ec601
+20200075
+2040677f
+18e27e00
+c000e51c
+2040007a
+20200075
+20406821
+20406730
+203a006c
+20206812
+6fe14f74
+67e14eae
+6fe14f76
+67e14eb0
+202067be
+2040677f
+efe08013
+207a0000
+2040007a
+204000bd
+20406730
+243a008c
+dfe00035
+20206382
+6fe0cec7
+c000807e
+c0000084
+20600000
+18e27e00
+c00280c7
+c00000d8
+c00200e0
+c00100fe
+20600000
+efe08013
+c00080c7
+c00100d8
+c00180e0
+c00200fe
+c002808b
+20600000
+2020013f
+20400094
+204000a9
+204000b3
+dfe00005
+20406382
+7049e53c
+dfe00006
+20206382
+2040009f
+18427e00
+207a0000
+67e0ceb3
+dfe00011
+20406382
+6fe0ceb3
+1fe0ffff
+67e0ceb3
+207a0000
+20200098
+6848ceaa
+20406730
+207a0000
+6848cead
+18408401
+6fe0cec6
+207a0000
+6848ceaa
+704ec600
+20600000
+6fe0ceac
+207a0000
+67e0ceb4
+dfe00016
+20406382
+6fe0ceb4
+1fe0ffff
+67e0ceb4
+207a0000
+202000ac
+6fe0cead
+207a0000
+67e0ceb5
+dfe00017
+20406382
+6fe0ceb5
+1fe0ffff
+67e0ceb5
+207a0000
+202000b6
+6fe0ceab
+247a0000
+704eab01
+202000ce
+6fe0ceac
+207a0000
+1fe0ffff
+67e0ceac
+dfe00062
+20600000
+2040011e
+6fe14eae
+98467c00
+244100c1
+24610000
+98467e00
+67e14eae
+20406730
+203a012e
+6fe14eae
+68494eb0
+184d0400
+18520400
+9840fe00
+67e1cb17
+20400135
+2020013f
+20406730
+245a0123
+2040011e
+6fe14eae
+9840fe00
+d8400fff
+20407d6c
+202000cd
+20406730
+203a00f7
+2040011e
+6fe14eb0
+98467e00
+67e14eb0
+68494eb0
+58000fff
+98467e00
+d8400062
+98460400
+242100ce
+58000fff
+98467e00
+6848cead
+18467c05
+202280f4
+18408401
+6048cead
+20200117
+704ead00
+58000fff
+20200117
+2040011e
+6fe14eb0
+98467c00
+24610000
+98467e00
+67e14eb0
+202000ce
+20406730
+203a0107
+2040011e
+6fe14eb0
+9840fe00
+d8400fff
+98462200
+2021010d
+20200117
+2040011e
+6fe14eb0
+9840fe00
+d8400fff
+20407d6c
+20200117
+20406730
+203a0119
+6fe0cead
+203a0119
+1fe0ffff
+67e0cead
+58000fff
+d8400062
+98467e00
+9a20fe00
+67e14eb0
+202000ce
+58000fff
+20200117
+704eac00
+dfe00000
+202000cd
+d840000a
+20406730
+207a0000
+d8400007
+20600000
+6fe14eae
+d8400062
+98460400
+24610000
+18427e00
+6848ceac
+18467c03
+2022811b
+18408401
+6048ceac
+202000cd
+6fe14eae
+68494eb0
+18500400
+9840fe00
+67e24b17
+20400135
+2020013f
+20406730
+243a0149
+58000017
+1feffe0a
+d8404c02
+98408a00
+18a08a04
+6fe24b17
+e7e20005
+202067be
+20406730
+243a0149
+58000034
+1feffe0a
+d8404c02
+98408a00
+18a08a04
+6fe24b17
+e7e20005
+20600000
+58000004
+1feffe0a
+d8404c02
+98408a00
+18a08a03
+6fe14eae
+e7e18005
+18a08a07
+6fe14eb0
+1ff27e00
+1fed7e00
+e7e18005
+202067be
 2435a002
 37d98200
 37d98200
 20202002
 204025c2
-c5978026
+c5978160
 783cfc00
 2000001e
 204025c2
@@ -42,7 +356,7 @@
 78507c00
 19623600
 37c18400
-2037002f
+20370169
 1b420400
 604b000f
 242c26fa
@@ -54,7 +368,7 @@
 984fb600
 20406877
 20372677
-2040003d
+20400177
 6fe08168
 c301a677
 2055a477
@@ -80,40 +394,16 @@
 20407d10
 1a220400
 2020247d
-20400057
-6fe0cec7
-c00065a2
-c000e5a5
-20600000
-18e27e00
-c000e777
-c0016765
-c0026761
-20600000
-6fe0cf9f
-243a6502
-704c0001
-20404323
-2040652c
-20406561
-20216500
-18e27e00
-6848cec5
-98467c00
-2442806f
-6fe0cec9
-245a006a
-20206515
 18e27e00
-c003006d
+c003018f
 20600000
 704ec900
 20204325
 6fe0cec9
-203a0072
+203a0194
 20206529
 20406730
-203a0075
+203a0197
 202064c5
 18e27e00
 2fe00e01
@@ -147,13 +437,13 @@
 efe18006
 67e1c397
 c003e704
-c0008097
+c00081b9
 202066db
 18c08dfe
 efe08006
-c003009b
+c00301bd
 20600000
-2040009d
+204001bf
 202067bf
 704eaa01
 7049e400
@@ -174,7 +464,7 @@
 24417806
 1a608c09
 efe08006
-243a00b2
+243a01d4
 20206547
 704ec001
 2040656b
@@ -190,7 +480,7 @@
 20402018
 2040310f
 2040248c
-202000b8
+202001da
 708a0f60
 708a10aa
 708a127a
@@ -219,14 +509,14 @@
 708a844a
 708a8540
 708a16fe
-20400122
+20400249
 6fe0c436
 205a70d7
-245580cf
+245581f1
 37d98200
 70813b5f
 6fe0c099
-c008010f
+c0080236
 6fe0c438
 1fe1fe04
 67f08a02
@@ -237,18 +527,23 @@
 67f18a73
 708a8660
 708a8b3b
-20400101
+20400228
 70804300
 70804205
 58557474
 67f18968
 7089606e
-20400217
-20400242
-204000fb
+2040033e
+20400369
+20400222
+708a3006
+708a32dd
+708a88e0
+708a8c2d
+708a3178
 7041480c
 20406f4e
-20200244
+2020036b
 20758000
 37d98200
 6fe0c11c
@@ -256,7 +551,7 @@
 37d98200
 20600000
 6fe0c099
-c00c0107
+c00c022e
 6fe0c438
 1fe1fe06
 67f08a02
@@ -279,16 +574,16 @@
 67f18a73
 708a762a
 70890204
-202000ed
+2020020f
 6fe0c141
-c005011d
+c0050244
 2020220e
 708a1425
 58a93f3f
 67f18a60
 708a631f
 20600000
-20358149
+20358270
 6fe2020d
 207a0000
 37d98200
@@ -330,7 +625,7 @@
 6fe1415b
 207a0000
 67e1020f
-20200133
+2020025a
 2040686f
 204021ba
 18002a08
@@ -357,7 +652,7 @@
 20206b38
 20406f35
 7044ecff
-2040016a
+20400291
 2040701b
 2020739a
 6fe0c6ce
@@ -368,42 +663,43 @@
 efe08011
 6848c6cf
 98467c00
-20228175
+2022829c
 1fe20400
-20400178
+2040029f
 1a20a201
-c200016f
+c2000296
 20600000
 79200407
 20206edd
 20407396
 20758000
+204042a3
 7040a60a
 20406454
 20406459
-580001d3
+580002fb
 67e143db
-580001b0
+580002d8
 67e143dd
-580001c5
+580002ed
 67e143df
 580062d3
 67e143d3
-58000165
+5800028c
 67e143d5
 58006329
 67e143d7
-580001a9
+580002d1
 67e143e3
 58006505
 67e14524
-20400195
+204002bd
 2020647d
 5800632b
 67e143d5
 58006329
 67e143d7
-5800019f
+580002c7
 67e1451f
 5800639a
 67e14521
@@ -415,7 +711,7 @@
 202077ac
 6fe0c51c
 c1808000
-204001a3
+204002cb
 20206342
 6fe14512
 67e14518
@@ -431,15 +727,15 @@
 20406311
 202064d9
 1a627e00
-c00a01b7
-c00a81b5
-c02001bc
+c00a02df
+c00a82dd
+c02002e4
 202064e0
-204001a3
+204002cb
 202064ef
 1c427e00
 67e249e6
-204001a6
+204002ce
 20406729
 202062e2
 6fe1433c
@@ -447,18 +743,18 @@
 6fe4450a
 207a0000
 20406730
-243a01d0
+243a02f8
 6fe44f02
 67e442d3
 20202e93
 6fe14398
-c01201c8
+c01202f0
 20600000
 204078ad
 7044f101
 20406730
 2040432b
-243a01d0
+243a02f8
 6fe44f02
 67e442d3
 20202e93
@@ -474,7 +770,7 @@
 20407ce1
 78547c00
 2040701b
-202001dd
+20200305
 6fe148ac
 67e1442e
 204065be
@@ -490,7 +786,7 @@
 67e1068c
 18e27e00
 67e1067a
-204001fa
+20400322
 6fe1068c
 1fe22600
 6fe1067a
@@ -502,7 +798,7 @@
 1fe0a60a
 6fe10678
 1fe27200
-c20001e6
+c200030e
 20600000
 1a60a405
 efe20012
@@ -513,25 +809,24 @@
 24417806
 580003e8
 98467c00
-20200204
+2020032c
 1a608c04
 efe08006
-20200207
+2020032f
 2040656b
 6fe0cec9
 243a655d
 20406561
 20216500
-2040020e
+20400336
 20206557
 da604a30
+7049e51e
 20406730
 207a0000
 da604b57
 18e27e00
-7049e578
-c1008000
-7049e5e6
+7049e53c
 20600000
 20758000
 20402160
@@ -545,7 +840,7 @@
 708ac200
 708ac300
 d8e00006
-20400234
+2040035b
 2a2ffe0d
 2040211d
 2a4ffe0d
@@ -553,14 +848,14 @@
 d8e00005
 2040211c
 2040211e
-20400234
+2040035b
 d8a08ac2
 1a31fe00
 20402117
 1a51fe00
 20402117
 18e08fff
-20210229
+20210350
 2020214f
 2000003c
 58000f00
@@ -586,7 +881,7 @@
 6fe0c409
 67f080cd
 20000bb8
-2040026d
+20400394
 708a08c1
 6a40c419
 df200008
@@ -595,7 +890,7 @@
 67e0c433
 6240c419
 20600000
-20400263
+2040038a
 6ff08a09
 793ffe07
 67f08a09
@@ -606,7 +901,7 @@
 6fe0c409
 67f080cd
 20000bb8
-2040026d
+20400394
 7080cd00
 20206fa1
 6ff080cc
@@ -621,7 +916,7 @@
 20600000
 7080cc03
 6ff08129
-c302826e
+c3028395
 68590164
 6049440a
 7080cc00
@@ -630,7 +925,7 @@
 708a8d12
 708a8e0a
 6fe0c099
-c008028d
+c00803b4
 58005762
 67f10907
 70890103
@@ -641,7 +936,7 @@
 708a8d44
 708a8e0a
 6fe0c099
-c008028a
+c00803b1
 58002bb1
 67f10907
 c6978000
@@ -650,10 +945,10 @@
 20600000
 58004189
 67f10907
-20200286
+202003ad
 58008312
 67f10907
-2020027b
+202003a2
 6fe0c334
 c1000000
 c001b04a
@@ -665,7 +960,7 @@
 6fe240ad
 9840fe00
 67e240ad
-2040029d
+204003c4
 20202425
 600440e7
 d8c08070
@@ -683,11 +978,11 @@
 efe08011
 e8408013
 98467c00
-202282b0
+202283d7
 e7e08013
 37d98200
 1a20a201
 1a60a601
-c20002aa
+c20003d1
 1a420400
 20600000
Index: output/sched.rom
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/output/sched.rom	(revision 6444)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/output/sched.rom	(working copy)
@@ -19,7 +19,7 @@
 00   #mem_patch11
 00   #mem_patch12
 00   #mem_patch13
-68   #mem_patch14
+e8   #mem_patch14
 14   #mem_patch15
 02   #mem_patch16
 00   #mem_patch17
@@ -118,9 +118,9 @@
 #hard_soft_switch config
 mem_shutter_hard_soft_switch_case_temp:01
 mem_shutter_soft_switch_button_gpio_temp:06
-#mem_shutter_soft_switch_button_gpio_temp:12
+# mem_shutter_soft_switch_button_gpio_temp:12
 
-#100ms timer 
+#100ms timer
 mem_shutter_ble_discovery_time_conf:
 28 23 #discovery_timeout
 50 46 #connect_timeout
@@ -139,14 +139,15 @@
 #14   #up
 #07   #left
 
-#test 7key
-# 06   #right
-# 15   #like
-# 08   #down
-# 0a   #photo
-# 14   #up
-# 07   #left
-# 0d   #move
+#dy socket
+# 08   #right
+# 07   #like
+# 0f   #down
+# 12   #photo
+# 02   #up
+# 06   #left
+# 0e   #move
+
 
 #jxy_pcb217
 07   #right
@@ -204,34 +205,42 @@
 40 00
 
 mem_shutter_iphone_move_mid:
-15 15 1a 16 12 12 00
+# 15 15 1a 16 12 12 00
+00
 mem_shutter_iphone_up_mid:
-15 15 1a 39 12 12 00
+# 15 15 1a 39 12 12 00
+00
 mem_shutter_iphone_like_mid:
-15 15 1a 3a 12 12 
+# 15 15 1a 3a 12 12
+00
 mem_shutter_android_move_mid:
-13 38 12 12 00
+# 13 38 12 12 00
+00
 
 mem_key0_press_i:  #right
 00
 mem_key0_release_new_i:
-0e 11 11 12 2c 2e 2f 30 32 33 0f 0f 00
+# 0a 0e 0e 0e 0b 0d 0d 0d 00
+22 23 24 25 26 27 28 29 2a 2b
 mem_key0_long_press_i:
-3c 37 00
+33 09 00
 
 mem_key1_press_i:#like
-0e 2a 12 2b 00
+00
 mem_key1_release_new_i:
-12 12 00
+# 0a 0b 00
+1c 2c 00
 
 mem_shutter_link_data_i:
-0e 12 12 0e 12 12 00
+# 0a 0b 0a 0b 00
+1c 2c 1c 2c 00
 
 mem_key2_press_i:#down
 00
 mem_key2_release_new_i:
-0e 14 14 14 12 22 23 24 25 17 17 17 00
-#0e 14 14 12 22 23 24 25 26 29 17 17 00
+# 0a 10 10 10 0b 0f 0f 0f 00
+20 1f 1e 1d 1c 1b 1a 19 21
+
 
 #toggle between vol-inc and vol-dec
 mem_key3_press_i:#photo
@@ -251,41 +260,44 @@
 mem_key4_press_i:#up
 00
 mem_key4_release_new_i:
-0e 17 17 17 12 29 26 25 24 23 14 14 14 00
-#0e 17 17 12 29 26 25 24 23 22 34 14 14 00
+# 0a 0f 0f 0f 0b 10 10 10 00
+19 1a 1b 1c 1d 1e 1f 20 21
 
 mem_key5_press_i:#left
 00
 mem_key5_release_new_i:
-0e 0f 0f 12 32 31 2f 2e 2c 35 11 11 00
+# 0a 0d 0d 0d 0b 0e 0e 0e 00
+2b 2a 29 28 27 26 25 24 23 22
+
 mem_key5_long_press_i: #lock
-36 37 00
+32 09 00
 
 
 mem_key6_release_new_i:#move
-0e 2a 12 2b 12 00
+# 0e 2a 12 2b 12 00
+0a 0b 00
 mem_key6_release_new:#move
-0e 12 12 12 12 00
+18 35 00
 
 mem_dy_key0_press:  #right
 00
 mem_key0_release_new:
-10 0b 0e 1d 1d 1d 12 00
-# mem_key0_long_press: 
-# 3b 37 00
+23 24 25 26 27 28 29 2a 2b
+mem_key0_long_press:
+# 34 09 00
 
 mem_dy_key1_press:#like
-0e 12 12 00
+00
 mem_key1_release_new:
-12 12 00
-
+1c 2c 00
+# 18 36 00
 mem_shutter_link_data:
-0e 12 12 0e 12 12 12 00
+1c 2c 1c 2c 00
 
 mem_dy_key2_press: #down
 00
 mem_key2_release_new:
-13 18 0e 1e 0c 0c 0c 0c 12 13 18 00
+20 1f 1e 1d 1c 1b 1a 19 21
 mem_key2_long_press:#volume decrement
 08 09 00
 mem_key2_long_release:
@@ -310,8 +322,8 @@
 mem_dy_key4_press:#up
 00
 mem_key4_release_new:
-15 19 0e 0d 0d 0d 0d 12 15 19 00
-mem_key4_long_press:#volume increment
+19 1a 1b 1c 1d 1e 1f 20 21
+mem_key4_long_press:
 07 09 00
 mem_key4_long_release:
 00
@@ -320,16 +332,16 @@
 mem_dy_key5_press:#left
 00
 mem_key5_release_new:
-15 0a 0e 1c 1c 1c 12 12 00
+2a 29 28 27 26 25 24 23 22
 mem_key5_long_press: #lock
-36 37 00
+32 09 00
 
 mem_combine_key0_press:
 01
 mem_combine_key1_press:
 02
 mem_combine_key2_press:
-03 
+03
 mem_combine_key3_press:
 04
 mem_combine_key_release:
@@ -343,79 +355,80 @@
 
 ################ble kb val list#######################
 mem_shutter_mousekey_value_list:
-03 1f 00 ec 0f 00 00 00 00 00#1
-03 1f 00 14 00 00 00 00 00 00#2
-03 1f 00 00 c0 fe 00 00 00 00#3
-03 1f 00 00 40 01 00 00 00 00#4
-03 1f 00 00 00 00 00 00 00 00#5
-03 1f 00 00 00 00 00 00 00 00#6
-02 1b 00 01 00 00 00 00 00 00#7 volume increment
-02 1b 00 02 00 00 00 00 00 00#8 volume decrement
-02 1b 00 00 00 00 00 00 00 00#9 release
-03 1f 00 28 f0 15 00 00 00 00#a
-#03 1f 00 28 80 11 00 00 00 00#a
-03 1f 00 ae ff 15 00 00 00 00#b
-#03 1f 00 ae 8f 11 00 00 00 00#b
-#03 1f 00 00 e0 fc 00 00 00 00 #c
-03 1f 00 00 e0 f9 00 00 00 00 #c
-03 1f 00 00 00 0a 00 00 00 00 #d
-#03 1f 00 00 00 05 00 00 00 00 #d
-03 17 00 01 00 00 00 00 00 00#e
-03 1f 00 27 00 00 00 00 00 00#f
-03 1f 00 ff 17 80 00 00 00 00#10
-03 1f 00 d8 0f 00 00 00 00 00#11
-03 17 00 00 00 00 00 00 00 00#12
-03 1f 00 01 f8 7f 00 00 00 00#13
-03 1f 00 00 40 fc 00 00 00 00#14
-03 1f 00 01 18 80 00 00 00 00#15
-03 1f 00 3c 40 13 00 00 00 00#16
-#03 1f 00 3c 40 0b 00 00 00 00#16
-03 1f 00 00 c0 03 00 00 00 00#17
-03 1f 00 6c 40 f0 00 00 00 00 #18
-#03 1f 00 1c 40 ec 00 00 00 00 #18
-#03 1f 00 3c 82 0c 00 00 00 00 #19
-03 1f 00 6c 80 0a 00 00 00 00 #19
-03 1f 00 00 10 80 00 00 00 00#1a
-03 1f 00 3c 80 07 00 00 00 00#1b
-03 1f 00 96 00 00 00 00 00 00#1c
-03 1f 00 6a 0f 00 00 00 00 00#1d
-03 1f 00 02 d0 ff 00 00 00 00#1e
-03 1f 00 02 30 00 00 00 00 00#1f
-03 1f 00 64 00 00 00 00 00 00#20
-03 1f 00 00 b0 f9 00 00 00 00#21
-07 13 00 07 06 70 07 ac 0d 01#22
-07 13 00 07 06 70 07 80 0c 01#23
-07 13 00 07 06 70 07 54 0b 01#24
-07 13 00 07 06 70 07 28 0a 01#25
-07 13 00 07 06 70 07 fc 08 01#26
-07 13 00 07 06 70 07 d0 07 01#27
-07 13 00 07 06 70 07 a4 06 01#28
-07 13 00 00 06 70 07 78 05 00#29
-07 13 00 07 07 70 07 70 07 01#2a
-07 13 00 00 07 70 07 70 07 00#2b
-07 13 00 07 05 10 0c 70 04 01#2c
-07 13 00 07 05 48 0b 70 04 01#2d
-07 13 00 07 05 F0 0A 70 04 01#2e
-07 13 00 07 05 C4 09 70 04 01#2f 
-07 13 00 07 05 6C 07 70 04 01#30
-07 13 00 07 05 40 04 70 04 01#31
-07 13 00 07 05 E8 02 70 04 01#32
-07 13 00 00 05 00 02 70 04 00#33
-07 13 00 00 06 70 07 ac 0e 00#34
-07 13 00 00 05 10 0d 70 04 00#35
-02 1b 00 04 00 00 00 00 00 00#36 #lock
-02 1b 00 00 00 00 00 00 00 00#37
-03 1f 00 a0 30 e8 00 00 00 00#38
-03 1f 00 3c 40 07 00 00 00 00#39
-03 1f 00 41 40 0b 00 00 00 00#3a
-02 1b 00 10 00 00 00 00 00 00#3b #home
-#08 27 00 00 00 00 00 00 00 00 00#3c
-#08 27 00 09 00 00 00 00 00 00 00#3d
-#08 27 00 09 00 14 00 00 00 00 00#3e
-02 1b 00 08 00 00 00 00 00 00#3c #home		
+03 1f 00 ec 0f 00 00 00 00 00 #1
+03 1f 00 14 00 00 00 00 00 00 #2
+03 1f 00 00 c0 fe 00 00 00 00 #3
+03 1f 00 00 40 01 00 00 00 00 #4
+03 1f 00 00 00 00 00 00 00 00 #5
+03 1f 00 00 00 00 00 00 00 00 #6
+02 1b 00 01 00 00 00 00 00 00 #7 volume increment
+02 1b 00 02 00 00 00 00 00 00 #8 volume decrement
+02 1b 00 00 00 00 00 00 00 00 #9 release
+
+03 17 00 01 00 00 00 00 00 00 #0a
+03 17 00 00 00 00 00 00 00 00 #0b
+03 1f 00 00 00 00 00 00 00 00 #0c
+03 1f 00 27 00 00 00 00 00 00 #0d ios left
+03 1f 00 d8 0f 00 00 00 00 00 #0e ios right
+03 1f 00 00 c0 03 00 00 00 00 #0f  ios up
+03 1f 00 00 40 fc 00 00 00 00 #10 ios down
+
+03 1f 00 01 f8 7f 00 00 00 00 #11
+03 1f 00 01 18 80 00 00 00 00 #12
+03 1f 00 00 10 80 00 00 00 00 #13
+03 1f 00 3c 00 0e 00 00 00 00 #14
+
+03 1f 00 02 30 00 00 00 00 00 #15
+03 1f 00 64 00 00 00 00 00 00 #16
+03 1f 00 00 b0 f9 00 00 00 00 #17
+
+05 23 00 07 00 00 00 00 00 00 #18
+05 23 00 07 f0 04 f0 02 00 00 #19
+05 23 00 07 f0 04 1c 04 00 00 #1a
+05 23 00 07 f0 04 48 05 00 00 #1b
+05 23 00 07 f0 04 74 06 00 00 #1c like press
+05 23 00 07 f0 04 a0 07 00 00 #1d
+05 23 00 07 f0 04 cc 08 00 00 #1e
+05 23 00 07 f0 04 f8 09 00 00 #1f
+05 23 00 07 f0 04 24 0b 00 00 #20
+05 23 00 00 f0 04 24 0b 00 00 #21
+
+05 23 00 00 f0 07 60 06 00 00#22
+05 23 00 07 a3 06 50 06 00 00#23
+05 23 00 07 66 05 50 06 00 00#24
+05 23 00 07 2c 04 60 06 00 00#25
+05 23 00 07 02 03 50 06 00 00#26
+05 23 00 07 e2 02 50 06 00 00#27
+05 23 00 07 44 02 60 06 00 00#28
+05 23 00 07 73 01 50 06 00 00#29
+05 23 00 07 03 01 50 06 00 00#2a
+05 23 00 00 01 00 60 06 00 00#2b
+
+05 23 00 04 f4 01 cc 01 00 00 #2c like release
+
+03 1f 00 3c 40 07 00 00 00 00 #2d
+03 1f 00 41 40 0b 00 00 00 00 #2e
+
+02 27 00 30 00 00 00 00 00 00 #2f
+02 27 00 00 00 00 00 00 00 00 #30
+03 1f 00 00 f0 7f 00 00 00 00 #31 down
+
+02 1b 00 04 00 00 00 00 00 00 #32 lock
+02 1b 00 08 00 00 00 00 00 00 #33 ios home
+02 1b 00 10 00 00 00 00 00 00 #34 android home
+
+05 23 00 06 00 00 00 00 00 00 #35
+
+05 23 00 00 00 00 00 00 00 00 #36
+03 1f 00 00 40 00 00 00 00 00 #37
+03 1f 00 3c 40 04 00 00 00 00 #38
+03 1f 00 3c 40 15 00 00 00 00 #39
+03 1f 00 00 10 80 00 00 00 00 #3a
+03 1f 00 00 c0 ff 00 00 00 00 #3b
+07 13 00 07 06 70 07 ac 0d 01 #3c
 
 mem_shutter_move_data:
-00 00 00  #defualt 
+00 00 00  #defualt
 
 #mem_le_dy_adv_data:
 #02 01 05
@@ -439,40 +452,40 @@
 #attribute list: handle 2bytes, uuid 2bytes, length 1bytes, attribute Nbytes
 mem_shutter_le_uuid_sup:
 #Primary service GATT ------
-01 00 02 00 28 02 01 18 
+01 00 02 00 28 02 01 18
 #Service changed
-02 00 02 03 28 01 20 
+02 00 02 03 28 01 20
 03 00 02 05 2a 01 00
 #Client Characteristic Configuration
-04 00 02 02 29 02 00 00 
+04 00 02 02 29 02 00 00
 
 #Primary service GAP ------
 05 00 02 00 28 02 00 18
 
 #Device name
-06 00 02 03 28 01 02 
+06 00 02 03 28 01 02
 07 00 02 00 2a 13 43 68 69 70 73 65 61 2d 42 4c 45 20 20 20 20 20 20 20 20
 
 #Appearance
-08 00 02 03 28 01 02 
-09 00 02 01 2a 02 c1 03 
+08 00 02 03 28 01 02
+09 00 02 01 2a 02 c1 03
 
 #Peripheral Preferred Connection Parameters
-0a 00 02 03 28 01 02 
+0a 00 02 03 28 01 02
 0b 00 02 04 2a 08 06 00 06 00 64 00 2c 01 # interval 6ms, latency 100, timeout 300
 
 #Primary service device information ------
-0c 00 02 00 28 02 0a 18 
+0c 00 02 00 28 02 0a 18
 #PNP id
-0d 00 02 03 28 01 02 
+0d 00 02 03 28 01 02
 0e 00 02 50 2a 07 01 05 0e 00 0a 02 40
 
 #Primary service hid ------
-0f 00 02 00 28 02 12 18 
+0f 00 02 00 28 02 12 18
 
 #Protocol mode
-10 00 02 03 28 01 06 
-11 00 02 4e 2a 01 01 
+10 00 02 03 28 01 06
+11 00 02 4e 2a 01 01
 
 
 #Hid report
@@ -484,18 +497,18 @@
 15 00 02 08 29 02 01 01 # report id=1, type=1 input
 
 #Hid report id 4
-16 00 02 03 28 01 10 
+16 00 02 03 28 01 10
 17 00 02 4d 2a 03 00 00 00
 #Client Characteristic
-18 00 02 02 29 02 00 00 
+18 00 02 02 29 02 00 00
 #Report reference
 19 00 02 08 29 02 04 01 # report id=4, type=1 input
 
 #Hid report id 3
 1a 00 02 03 28 01 10
-1b 00 02 4d 2a 02 00 00 
+1b 00 02 4d 2a 02 00 00
 #Client Characteristic
-1c 00 02 02 29 02 00 00 
+1c 00 02 02 29 02 00 00
 #Report reference
 1d 00 02 08 29 02 03 01 # report id=3, type=1 input
 
@@ -503,44 +516,81 @@
 1e 00 02 03 28 01 10
 1f 00 02 4d 2a 03 00 00 00
 #Client Characteristic
-20 00 02 02 29 02 00 00 
+20 00 02 02 29 02 00 00
 #Report reference
 21 00 02 08 29 02 05 01 # report id=5, type=1 input
 
-#Hid report id 2
-22 00 02 03 28 01 12
-23 00 02 4d 2a 02 00 00 
-#00 00 00 00 00
+#Hid report id 6
+22 00 02 03 28 01 10
+23 00 02 4d 2a 05 00 00 00 00 00
 #Client Characteristic
 24 00 02 02 29 02 00 00
 #Report reference
-25 00 02 08 29 02 02 01 # report id=2, type=1 input
+25 00 02 08 29 02 06 01 # report id=6, type=1 input
 
-#Hid report id 6
+#Hid report id 2
 26 00 02 03 28 01 12
-27 00 02 4d 2a 08 00 00 00 00 00 00 00 00
+27 00 02 4d 2a 02 00 00
+#00 00 00 00 00
 #Client Characteristic
-28 00 02 02 29 02 00 00 
+28 00 02 02 29 02 00 00
 #Report reference
-29 00 02 08 29 02 06 01 # report id=6, type=1 input
+29 00 02 08 29 02 02 01 # report id=2, type=1 input
+
 #Report map
-2a 00 02 03 28 01 02 
+2a 00 02 03 28 01 02
 2b 00 02 4b 2a 01 00
 
 #Hid information
 2c 00 02 03 28 01 02
-2d 00 02 4a 2a 04 11 01 00 01 
+2d 00 02 4a 2a 04 11 01 00 01
 
 #Hid control point
-2e 00 02 03 28 01 04 
-2f 00 02 4c 2a 01 00 
+2e 00 02 03 28 01 04
+2f 00 02 4c 2a 01 00
 30 00 02 00 28 02 0f 18
 
 00 00
-
-mem_shutter_le_map_len_android:72 00 #6d 00
-mem_shutter_le_map_len_ios:c9 00
+mem_shutter_le_map_len_android:76 00
+mem_shutter_le_map_len_ios:21 01
 mem_shutter_le_hid_map:
+05 0d	#Usage Page (Digitizer)
+09 01 	# Usage(Digitizer)
+a1 01 	#Collection (Application)
+85 06	#Report Id (6)
+09 22 	#Usage (Finger)
+a1 02  	#Collection (Logical)
+09 42	#Usage (Tip Switch)
+15 00	#Logical minimum (0)
+25 01 	#Logical maximum (1)
+75 01	#Report Size (1)
+95 01	#Report Count (1)
+81 02 	#Input (Data,Value,Absolute,Bit Field)
+09 32	#Usage (In Range)
+81 02  	#Input (Data,Value,Absolute,Bit Field)
+95 06	#Report Count (2)
+81 03 	#Input (Constant,Array,Absolute,Bit Field)
+05 01	#Usage Page (Generic Desktop)
+#26 e8 03  #Logical maximum (1'000)
+26 ff 0f  #Logical maximum (4'095)
+75 10	#Report Size (16)
+95 01	#Report Count (1)
+55 0E #Unit Exponent (14)
+65 33 #Unit(51)
+#55 00	#Unit Exponent (0)
+#65 00	#Unit (None)
+09 30 	#Usage (X)
+35 00   #Physical Minimum (0)
+#46 e8 04  #Physical maximum (1'000)
+46 b5 04  #Physical maximum (1'205)
+81 02	#Input (Data,Value,Absolute,Bit Field)
+09 31	#Usage (Y)
+#46 e8 03  #Physical maximum (1'000)
+46 8a 03  #Physical maximum (906)
+81 02	#Input (Data,Value,Absolute,Bit Field)
+c0		#End Collection
+c0
+
 05 0c # Usage Page(Consumer) #legth 30
 09 01 # Usage(Consumer Control)
 a1 01 # Collection(Application)
@@ -557,6 +607,20 @@
 81 06 #Input (Data, Variable, Absolute)
 c0 #end
 
+#25
+05 0c
+09 01
+a1 01
+85 02
+19 00
+2a ff 03
+15 00
+26 ff 03
+95 01
+75 10
+81 00
+c0
+
 05 01 #Usage Page (Generic Desktop Controls)
 09 02 # Usage(Mouse)
 a1 01 # Collection(Application)
@@ -585,7 +649,7 @@
 0a 38 02 	#Usage (AC Pan)
 95 01 # Report Count(1)
 81 06 #INPUT (Data, Variable, Relative)
-c0 
+c0
 
 85 05 # Report ID(5)
 09 01 # Usage(Consumer Control)
@@ -600,7 +664,6 @@
 81 06 #Input (Data, Variable, Relative)
 c0 c0
 
-
 05 0D  # Usage Page(Digitizer)
 09 02  # Usage(Pen)
 A1 01 # Collection(Application)
@@ -633,7 +696,7 @@
 46 8A 03 #Physical Maximum (906)
 09 31 #Usage (y)
 81 02 #Input (Data, Variable, Absolute)
-C0 
+C0
 
 05 0D # Usage Page(Digitizer)
 09 54 # Usage(84)
@@ -644,14 +707,14 @@
 09 55 # Usage (Contact count mamimum)
 25 05 # Logical Maximum(5)
 B1 02 #Input (Data, Variable, Absolute)
-C0 
+C0
+
+
 
 ##############BLE ATT LIST END####################
 mem_dy_le_search_service_uuid:
 D0 00 2D 12 1E 4B 0F A4 99 4E CE B5 31 F4 05 79
 
-
-
 mem_system_clk:0c
 mem_lpm_xtalcnt:70 3f 64
 mem_lpm_isogate:db 7b 3b
Index: program/app_shutter_dy.prog
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/program/app_shutter_dy.prog	(revision 6444)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/program/app_shutter_dy.prog	(working copy)
@@ -35,7 +35,7 @@
 	beq SHUTTER_SEVEN_KEY,shutter_dy_7_key_conf
 	beq SHUTTER_EIGHT_KEY,shutter_dy_8_key_conf
 	rtn
-	
+
 shutter_dy_adv_conf:
 	bpatch patch14_1,mem_patch14
 	//adv data
@@ -48,7 +48,7 @@
 	store 7,mem_shutter_led_struct_app_led
 	fetch 7,mem_shutter_led_off_light_dark_led_conf
 	store 7,mem_shutter_power_off_led_style
-	
+
 	fetch 4,mem_shutter_reconn_blink_on_time_conf
 	store 4,mem_ble_shutter_reconn_blink_on_time
 	fetch 4,mem_shutter_discovery_blink_on_time_conf
@@ -58,20 +58,20 @@
 	store 8,mem_le_adv_data
 	fetch 3,mem_le_dy_adv_data+8
 	store 3,mem_le_adv_data+8
-	
+
 	fetch 8,mem_le_dy_scan_data
 	store 8,mem_le_scan_data
 	fetch 4,mem_le_dy_scan_data+8
 	store 4,mem_le_scan_data+8
 	*/
-	
+
 	setarg 0x000e
 	store 2,mem_ble_shutter_reconn_adv_interval
 	setarg 0x0140
 	store 2,mem_ble_shutter_discovery_adv_interval
 	store 2,mem_le_adv_interval
 
-//	setarg mem_shutter_le_uuid_sup	//BLE ATT LIST 
+//	setarg mem_shutter_le_uuid_sup	//BLE ATT LIST
 //	store 2,mem_ui_le_uuid_table
 
 //	call shutter_load_dy_keyvalue_buffer_config_form_DataRom
@@ -92,7 +92,7 @@
 
 	setarg shutter_dy_process_idle
 	store 2,mem_cb_idle_process
-		
+
 	setarg shutter_dy_process_bb_event
 	store 2,mem_cb_bb_event_process
 
@@ -106,7 +106,7 @@
 	store 2,mem_cb_shutter_keycan
 
 	call shutter_common_init
-	
+
 	fetch 2,mem_shutter_le_pairing_handle
  	store 2,mem_le_pairing_handle
 	fetch 8,mem_ble_shutter_interval_min_new
@@ -128,7 +128,7 @@
 	call keyscan_process_lpm_before
 	branch shutter_dy_keyscan_key_process
 
-shutter_dy_iphone_every_move_max_set:	
+shutter_dy_iphone_every_move_max_set:
 	setarg 0x1f
 	mul32 pdata,EVERY_PAYLOAD_LEN,pdata
 	arg mem_shutter_mousekey_value_list,temp
@@ -142,8 +142,8 @@
 	lshift4 pdata,pdata
 	istore 2,rega
 	rtn
-	
-shutter_dy_shutter_send_data_to_master:	
+
+shutter_dy_shutter_send_data_to_master:
 	fetch 2,mem_ui_state_map
 	bbit1 UI_STATE_BLE_CONNECTED,shutter_dy_pop_queue_to_ble_data
 	arg mem_queue_curr_num,contw
@@ -165,7 +165,7 @@
 	rtn positive
 shutter_dy_pop_queue_to_ble_data2:
 	copy clkn_bt,pdata
-	store 4,mem_key_send_clk	
+	store 4,mem_key_send_clk
 	call queue_pop_one_byte
 	nrtn user
 	pincrease -1
@@ -183,7 +183,7 @@
 	call shutter_dy_clear_key_state_timer
 	call shutter_check_sleep_timer
 	branch shutter_dy_check_power_off_timer
-	
+
 shutter_dy_iphone_move_mid_timer:
 	arg mem_shutter_move_mid_timer,regc
 	arg shutter_dy_iphone_move_mid_timeout,regb
@@ -267,13 +267,13 @@
 	call shutter_dy_move_mode_disable
 	call shutter_dy_over_clear
 	branch ble_shutter_process_baseband_disconnect
-	
+
 ble_shutter_dy_process_baseband_connect:
 	copy clkn_bt,pdata
 	store 4,mem_key_send_clk
 	call shutter_dy_remote_not_iphone
 	branch ble_shutter_process_baseband_connect
-	
+
 
 shutter_dy_check_send_data:
 	disable user2
@@ -296,7 +296,7 @@
 
 shutter_dy_key_change:
 	call shutter_dy_check_send_data
-	nrtn user2 
+	nrtn user2
 	deposit rega
 	branch shutter_dy_shutter_key_release,blank//no data release
 shutter_dy_key_press:
@@ -409,21 +409,21 @@
 	beq SHUTTER_LIKE_KEY_NUM,shutter_dy_push_queue_release1_next
 	beq SHUTTER_PHOTO_KEY_NUM,shutter_dy_push_queue_release1_next
 	rtn
-	
+
 shutter_dy_jude_queue_size:
 	call queue_get_size
 	ifetcht 1,contr
 	isub temp,pdata
 	sub pdata,MAX_QUEUE_NEW_PRESS,null
 	rtn
-	
+
 shutter_dy_push_queue_long_release:
 	jam 1,mem_shutter_long_key_released_flag
 	call shutter_clear_dy_key_state
 	arg mem_key0_long_release,regc
 	arg MAX_QUEUE_NUM_LONG_RELEASE,pdata
 	branch shutter_dy_push_queue_press_or_release
-	
+
 shutter_clear_dy_key_state:
 	arg SHUTTER_KEY_CONF_SATE_BYTES,loopcnt
 	copy regc,contw
@@ -435,12 +435,12 @@
 	call shutter_dy_keyscan_key_process_next
 	fetch 2,mem_key_value_retention
 	store 2,mem_key_value_xmem
-	
+
 	arg 0,queue
 	fetch 1,mem_shutter_key_num
 	copy pdata,loopcnt
 	arg mem_shutter_key_state0,regc
-shutter_dy_keyscan_key_check_release_loop:	
+shutter_dy_keyscan_key_check_release_loop:
 	copy loopcnt,pdata
 	store 2,mem_temp
 	copy regc,pdata
@@ -448,13 +448,13 @@
 	copy queue,pdata
 	store 2,mem_temp+2
 	call shutter_dy_keyscan_key_check_release
-	
+
 	fetch 2,mem_regc
 	copy pdata,regc
-	fetch 2,mem_temp+2	
+	fetch 2,mem_temp+2
 	copy pdata,queue
 	call shutter_dy_keyscan_key_check_long_press
-	
+
 	fetch 2,mem_temp+2
 	add pdata,1,queue
 	fetch 2,mem_regc
@@ -463,13 +463,13 @@
 	copy pdata,loopcnt
 	loop shutter_dy_keyscan_key_check_release_loop
 	rtn
-	
+
 shutter_dy_keyscan_key_check_long_press:
 	ifetch KEY_STATE_PRESS_CLK_LENGTH,regc
 	rtn blank
 	copy pdata,temp
 	copy clkn_bt,pdata
-	isub temp,temp	
+	isub temp,temp
 	nrtn positive
 	setarg 2500 //1000ms 3200
 	isub temp,null
@@ -488,7 +488,7 @@
 	beq MOVE_COMBINE_KEY,shutter_dy_key_long_press_set_key_normal
 	beq MOVE_SINGLE_KEY,shutter_dy_key_long_press_set_move_trigger
 	rtn
-	
+
 shutter_dy_key_long_press_set_key_normal:
 	call shutter_dy_long_press_android_or_ios
 	arg MAX_QUEUE_NUM_LONG,pdata
@@ -498,7 +498,7 @@
 	copy queue,pdata
 	fetcht 1,mem_move_mode_key_index
 	isub temp,null
-	nbranch shutter_dy_key_long_press_set_key_normal,zero	
+	nbranch shutter_dy_key_long_press_set_key_normal,zero
 	fetch 1,mem_move_mode_trigger_enable
 	setflip 0,pdata
 	store 1,mem_move_mode_trigger_enable
@@ -529,7 +529,7 @@
 	fetch 2,mem_key_num_ptr
 	ifetch 1,pdata
 	rtn blank
-	
+
 	setarg 0
 	store 2,mem_key_value_temp
 	call keyscan_scan_key
@@ -542,7 +542,7 @@
 	fetch 1,mem_move_mode_set
 	beq MOVE_SINGLE_KEY,shutter_dy_skip_check_combine_key
 	call shutter_dy_check_combine_key_release
-	call shutter_dy_check_combine_key	
+	call shutter_dy_check_combine_key
 	rtn user
 shutter_dy_skip_check_combine_key:
 	call shutter_dy_single_key_led
@@ -569,16 +569,16 @@
 	imul32 queue,pdata
 	iadd regb,regb
 	ifetch 2,regb
-	
+
 	rtn blank
 	fetcht 2,mem_key_value_temp
 	ixor temp,null
 	branch shutter_dy_check_combine_key_parse,zero
 	increase 1,queue
 	branch shutter_dy_check_combine_key_loop
-	
+
 shutter_dy_check_combine_key_parse:
-	store 2,mem_combine_key_state0	
+	store 2,mem_combine_key_state0
 	call app_led_on
 	arg mem_combine_key0_press,regc
 	arg MAX_QUEUE_NUM_COMBINEKEY,pdata
@@ -586,7 +586,7 @@
 	iadd regc,regc
 	call shutter_dy_push_buffer_in_queue
 	branch shutter_dy_combine_key_enableuser
-	
+
 shutter_dy_push_buffer_in_queue:
 	call shutter_dy_jude_clear_move_config
 	ifetch 1,regc
@@ -790,7 +790,7 @@
 	arg 0xfff,temp
 	call ceiling
 	branch shutter_dy_move_store_x
-	
+
 shutter_dy_move_up:
 	call shutter_dy_every_move_size_set
 	fetch 2,mem_shutter_move_data_y
@@ -818,7 +818,7 @@
 shutter_dy_android_move_y_empty_check:
 	setarg 0xfff
 	branch shutter_dy_move_store_y
-	
+
 shutter_dy_move_y_empty_check:
 	call shutter_dy_check_iphone
 	branch shutter_dy_android_move_y_empty_check,blank
@@ -830,7 +830,7 @@
 	arg IPHONE_ONCE_MAX_MOVE_VALUE,temp
 	isub temp,pdata
 	iadd rega,pdata
-shutter_dy_move_store_y:	
+shutter_dy_move_store_y:
 	store 2,mem_shutter_move_data_y
 	branch shutter_dy_move_data_store
 shutter_dy_move_down:
@@ -842,14 +842,14 @@
 	isub temp,rega
 	branch shutter_dy_move_y_empty_check,positive
 	branch shutter_dy_move_store_y
-	
+
 
 ble_shutter_dy_receive_data:
 	fetch 2,mem_le_att_handle
 	beq GATT_KEYBOARD_WRITE_HANDLE_NEW,ble_shutter_process_reconnect_complete
 	rtn
 
-shutter_dy_le_find_service_hand_by_uuid: 
+shutter_dy_le_find_service_hand_by_uuid:
 	arg 23,rega
 	arg LE_L2CAP_CID_ATT,regb
 	call le_fifo_malloc_tx_l2cap
@@ -888,7 +888,7 @@
 	nbranch shutter_dy_le_parse_att_read_blob_request_ios,blank
 	fetcht 2,mem_shutter_le_map_len_android
 	branch shutter_dy_le_parse_att_read_blob_request2
-	
+
 shutter_dy_le_parse_att_read_blob_request_ios:
 	fetcht 2,mem_shutter_le_map_len_ios
 shutter_dy_le_parse_att_read_blob_request2:
@@ -977,20 +977,20 @@
 shutter_dy_not_iphone_read_conf:
 	call shutter_dy_remote_not_iphone
 	branch shutter_dy_load_move_config_info
-	
+
 shutter_dy_check_iphone:
 	fetch 1,mem_iphone_flag
 	rtn
 
 
-shutter_dy_le_get_press_ptr:	
+shutter_dy_le_get_press_ptr:
 	arg mem_dy_key0_press,regc
 	call shutter_dy_check_iphone
 	rtn blank
 	jam 120,mem_send_data_delay
 	arg mem_key0_press_i,regc
 	rtn
-shutter_dy_le_get_release_ptr:	
+shutter_dy_le_get_release_ptr:
 shutter_dy_le_get_release_ptr_set:
 	arg mem_key0_release_new,regc
 	call shutter_dy_check_iphone
@@ -1045,7 +1045,7 @@
 	fetch 1,mem_key3_press_count
 	branch shutter_dy_loop_send_volume_inc_page,blank
 	branch shutter_dy_loop_send_volume_dec_page
-	
+
 
 shutter_dy_loop_send_volume_inc_page:
 	jam 0,mem_key3_press_count
@@ -1086,7 +1086,7 @@
 	jam 1,mem_shutter_link_loop_flag
 	jam 2, mem_shutter_link_timer
 	rtn
-	
+
 shutter_dy_clear_link_key_timer:
 	jam 0,mem_shutter_link_loop_flag
 	jam 0, mem_shutter_link_timer
@@ -1176,7 +1176,7 @@
 //	fetch 1,mem_otp_last_shutter_le_iphone_flag
 //	store 1,mem_last_shutter_le_iphone_flag
 	rtn
-	
+
 shutter_dy_store_move_config_info:
 	branch shutter_dy_campare_effective_addr_write_otp
 
@@ -1240,7 +1240,7 @@
 	beq 0x01,shutter_dy_shutter_get_first_read_addr
 	beq 0x00,shutter_dy_shutter_next_read_addr
 	rtn
-	
+
 //比较数据，判断是否为0
 shutter_dy_campare_otp_data:
 	arg 0x0,regb
@@ -1277,7 +1277,7 @@
 	fetch 1,mem_otp_last_shutter_le_iphone_flag
 	icompare 0xff,temp
 	call shutter_dy_clear_temp_count,true
-	
+
 	fetch 1,mem_shutter_temp_count
 	rtneq 0
 	branch shutter_dy_shutter_judge_ios_or_android
@@ -1299,7 +1299,7 @@
 	isub temp,pdata
 	store 2, mem_shutter_move_data_y
 	branch shutter_dy_store_move_config_info
-	
+
 shutter_dy_shutter_ios_save_init_loaction:
 	arg IPHONE_ONCE_MAX_MOVE_VALUE,temp
 //	setarg IPHONE_INITIAL_MOVE_X
@@ -1318,7 +1318,7 @@
 	isub temp,pdata
 	store 2,mem_shutter_move_data_y
 	branch shutter_dy_store_move_config_info
-	
+
 shutter_dy_clear_temp_count:
 	jam 0,mem_shutter_temp_count
 	rtn
@@ -1350,14 +1350,14 @@
 	call shutter_dy_shutter_judge_ios_or_android
 	fetch 2,mem_otp_read_ios_android_addr
 	ncall shutter_dy_shutter_read_move_config_from_otp_addr,zero
-	
+
 	//检查为0则不赋值
 	jam 0,mem_shutter_temp_count
 	call shutter_dy_campare_otp_data
 	fetch 1,mem_shutter_temp_count
 	rtneq 0
 	branch shutter_dy_read_otp_convert_data
-	
+
 //取有效地址给mem_otp_write_offset_addr
 shutter_dy_campare_effective_addr_write_otp:
 	bpatch patch15_7,mem_patch15
@@ -1411,6 +1411,6 @@
 
 
 /*************shutter dy ending*********************/
-	
+
 endif
 
Index: program/patch.prog
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/program/patch.prog	(revision 6444)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/program/patch.prog	(working copy)
@@ -10,7 +10,7 @@
 	beq patch02_5,p_rf_rx_enable
 	beq patch03_0,p_txon
 	beq patch03_1,p_set_tx_power
-	beq patch03_2,p_initialize_radio_cont	
+	beq patch03_2,p_initialize_radio_cont
 	//beq patch03_3,p_rfpll_aac_ghpc
 	//beq patch03_5,p_dpll_ring_ibias_calc
 	beq patch04_5,p_lpm_sleep
@@ -18,6 +18,7 @@
 	beq patch14_3,p_shutter_dy_key_press
 	beq patch14_5,p_shutter_dy_shutter_key_release
 	beq patch14_6,p_shutter_dy_keyscan_key_check_long_press
+	beq patch14_7,p_shutter_dy_keyscan_key_process_next
 	beq patch15_2,p_shutter_dy_le_parse_att
 	beq patch15_4,p_shutter_dy_le_get_release_ptr_volume
 	beq patch16_1,p_shutter_dy_init
@@ -35,6 +36,415 @@
 	rtneq patch3f_7
 	branch assert
 
+p_shutter_dy_keyscan_key_check_long_press:
+	call p_shutter_dy_long_key_function
+	fetch 1,mem_move_mode_set
+	beq MOVE_COMBINE_KEY,shutter_dy_key_long_press_set_key_normal
+	beq MOVE_SINGLE_KEY,shutter_dy_key_long_press_set_move_trigger
+	rtn
+
+p_shutter_dy_long_key_function:
+	copy queue,pdata
+	beq SHUTTER_LIKE_KEY_NUM,shutter_dy_link_key_long_press
+	beq SHUTTER_DOWN_KEY_NUM,shutter_dy_loop_send_volume_dec_page
+	beq SHUTTER_UP_KEY_NUM,shutter_dy_loop_send_volume_inc_page
+	rtn
+
+p_shutter_dy_keyscan_key_process_next:
+	fetch 1,mem_move_mode_set
+	beq MOVE_SINGLE_KEY,shutter_dy_skip_check_combine_key
+	call shutter_dy_check_combine_key_release
+	call p_shutter_dy_check_combine_key
+	rtn user
+	branch shutter_dy_skip_check_combine_key
+
+p_shutter_dy_check_combine_key:
+	arg 0,queue
+p_shutter_dy_check_combine_key_loop:
+	arg mem_combine_key0,regb
+	arg 2,pdata
+	imul32 queue,pdata
+	iadd regb,regb
+	ifetch 2,regb
+
+	rtn blank
+	fetcht 2,mem_key_value_temp
+	ixor temp,null
+	branch p_shutter_dy_check_combine_key_parse,zero
+	increase 1,queue
+	branch p_shutter_dy_check_combine_key_loop
+
+p_shutter_dy_check_combine_key_parse:
+	store 2,mem_combine_key_state0
+	call app_led_on
+	arg mem_combine_key0_press,regc
+	arg MAX_QUEUE_NUM_COMBINEKEY,pdata
+	imul32 queue,pdata
+	iadd regc,regc
+	call p_shutter_dy_push_buffer_in_queue
+	branch shutter_dy_combine_key_enableuser
+
+p_shutter_dy_check_combine_key_release:
+	fetch 2,mem_combine_key_state0
+	rtn blank
+	fetcht 2,mem_key_value_temp
+	sub temp,0,null
+	branch p_shutter_dy_check_combine_key_release_all,zero
+	branch p_shutter_dy_check_combine_key_release+5
+
+p_shutter_dy_check_combine_key_release_all:
+	jam 1,mem_shutter_long_key_released_flag
+	call app_led_off
+	arg mem_combine_key_release,regc
+	call p_shutter_dy_push_buffer_in_queue
+	branch shutter_dy_check_combine_key_release_all+3
+
+p_shutter_dy_key_press:
+	fetch 1,mem_shutter_link_loop_flag
+	nbranch shutter_dy_key_value_filter,blank
+p_shutter_dy_key_press_next:
+	jam 1,mem_shutter_key_pressed
+	call app_led_on
+	call shutter_dy_key_press_clk
+	call shutter_dy_jude_queue_size
+	branch shutter_dy_over_clear,positive
+	copy queue,pdata
+	fetcht 1,mem_last_press_key_value
+	isub temp,null
+	ncall p_shutter_dy_iphone_check_move_mid,zero
+	fetch 1,mem_move_mode_trigger_enable
+	ncall p_shutter_short_key_cancel,blank
+	copy queue,pdata
+	store 1,mem_last_press_key_value
+	fetcht 1,mem_move_mode_key_index
+	isub temp,null
+	branch p_shutter_dy_key_move_to_specify_location,zero
+	fetch 1,mem_move_mode_trigger_enable
+	nbranch p_shutter_dy_move_set,blank
+	branch shutter_dy_page_set
+
+p_shutter_dy_key_move_to_specify_location:
+	jam 1,mem_shutter_first_move
+	branch p_shutter_dy_move_to_specify_location
+
+p_shutter_dy_move_set:
+	call shutter_dy_jude_clear_move_config
+	copy queue,pdata
+	beq SHUTTER_LIKE_KEY_NUM,shutter_dy_page_set
+	call p_shutter_dy_check_move_data
+	branch p_shutter_dy_move_to_specify_location
+
+p_shutter_not_find_ios_or_android:
+	call shutter_dy_clear_temp_count
+	call shutter_dy_check_iphone
+	branch p_shutter_dy_shutter_android_save_init_loaction,blank
+	branch shutter_dy_shutter_ios_save_init_loaction
+
+p_shutter_dy_shutter_android_save_init_loaction:
+	fetch 2,mem_android_initial_move_x
+	store 2, mem_shutter_move_data_x
+	fetch 2,mem_android_initial_move_y
+	store 2, mem_shutter_move_data_y
+	branch shutter_dy_store_move_config_info
+
+p_shutter_dy_push_buffer_in_queue:
+	call shutter_dy_jude_clear_move_config
+	ifetch 1,regc
+	rtn blank
+	call p_shutter_dy_check_move_data
+p_shutter_dy_move_to_specify_location:
+	call p_shutter_dy_jude_clear_move_config
+	call shutter_dy_check_iphone
+	nbranch p_move_ios_to_specify_location,blank
+	arg 0x35,pdata
+	branch queue_push_one_byte
+
+p_shutter_dy_check_move_data:
+	fetch 1,mem_move_mode_set
+	beq MOVE_SINGLE_KEY,p_check_move_data_single_key
+	beq MOVE_COMBINE_KEY,p_check_move_data_combine_key
+	rtn
+
+
+p_check_move_data_single_key:
+	copy queue,pdata
+	beq SHUTTER_LEFT_KEY_NUM,p_move_left
+	beq SHUTTER_RIGHT_KEY_NUM,p_move_right
+	beq SHUTTER_UP_KEY_NUM,p_move_up
+	beq SHUTTER_DOWN_KEY_NUM,p_move_down
+	rtn
+
+p_check_move_data_combine_key:
+	ifetch 1,regc
+	beq 0x01,p_move_left
+	beq 0x02,p_move_right
+	beq 0x03,p_move_up
+	beq 0x04,p_move_down
+	beq 0x05,p_move_release
+	rtn
+
+p_move_release:
+	branch p_get_move_release_data
+
+p_move_ios_to_specify_location:
+	call p_move_down_left_corner
+	call p_move_x_max
+	call p_move_y_max
+	arg 0x05,pdata
+	call queue_push_one_byte
+	jam 60,mem_send_data_delay
+	arg 0x06,pdata
+	branch queue_push_one_byte
+
+p_move_down_left_corner:
+	call p_move_down_left_corner_count_set
+	copy temp,pdata
+	rtn blank
+	store 1,mem_shutter_back_count_cache
+p_move_down_left_corner_loop:
+	arg 0x11,pdata
+	call queue_push_one_byte
+	fetch 1,mem_shutter_back_count_cache
+	increase -1,pdata
+	store 1,mem_shutter_back_count_cache
+	rtn blank
+	branch p_move_down_left_corner_loop
+
+p_move_down_left_corner_count_set:
+	fetcht 1,mem_shutter_back_count
+	call shutter_dy_check_iphone
+	rtn blank
+	fetcht 1,mem_shutter_iphone_beyond_y_count
+	increase 1,temp
+	fetch 1,mem_shutter_first_move
+	rtn blank
+	fetcht 1,mem_shutter_back_count
+	jam 0,mem_shutter_first_move
+	rtn
+
+p_move_x_max:
+	fetch 1,mem_shutter_iphone_beyond_x_count
+	rtn blank
+	store 1,mem_shutter_iphone_beyond_x_cache
+p_move_x_max_number:
+	arg 0x16,pdata
+	call queue_push_one_byte
+	fetch 1,mem_shutter_iphone_beyond_x_cache
+	increase -1,pdata
+	store 1,mem_shutter_iphone_beyond_x_cache
+	rtn blank
+	branch p_move_x_max_number
+
+p_move_y_max:
+	fetch 1,mem_shutter_iphone_beyond_y_count
+	rtn blank
+	store 1,mem_shutter_iphone_beyond_y_cache
+p_move_y_max_number:
+	arg 0x17,pdata
+	call queue_push_one_byte
+	fetch 1,mem_shutter_iphone_beyond_y_cache
+	increase -1,pdata
+	store 1,mem_shutter_iphone_beyond_y_cache
+	rtn blank
+	branch p_move_y_max_number
+
+p_shutter_dy_jude_clear_move_config:
+	fetch 1,mem_shutter_le_conned
+	nrtn blank
+	jam 1,mem_shutter_le_conned
+	branch p_move_data_store
+
+p_move_x_empty_check:
+	fetch 1,mem_shutter_iphone_beyond_x_count
+	rtn blank
+	increase -1,pdata
+	store 1,mem_shutter_iphone_beyond_x_count
+	arg IPHONE_ONCE_MAX_MOVE_VALUE,pdata
+	rtn
+
+
+p_move_left:
+	call p_every_move_size_set
+	fetch 2,mem_shutter_move_data_x
+	isub temp,null
+	ncall p_move_x_empty_check,positive
+	nrtn positive//if move_x to zero,rtn
+	isub temp,pdata
+p_move_store_x:
+	store 2,mem_shutter_move_data_x
+p_move_data_store:
+	call shutter_dy_check_iphone
+	branch p_move_android_data_store,blank //android
+	fetch 2,mem_shutter_move_data_x
+	fetcht 2,mem_shutter_move_data_y
+	lshift8 temp,temp
+	lshift4 temp,temp
+	iadd temp,pdata
+	store 3,mem_shutter_move_data
+	call p_get_move_data
+	branch p_get_move_release_data
+
+p_move_right:
+	call shutter_dy_check_iphone
+	ncall p_move_x_check_max,blank
+	call p_every_move_size_set
+	fetch 2,mem_shutter_move_data_x
+p_move_right_next:
+	iadd temp,pdata
+	arg 0xfff,temp
+	call ceiling
+	branch p_move_store_x
+
+p_move_up:
+	call shutter_dy_check_iphone
+	branch p_move_android_up_check_y, blank
+p_move_ios_y_check_max:
+	call p_every_move_size_set
+	fetch 2,mem_shutter_move_data_y
+	isub temp,pdata
+	store 2,mem_shutter_move_data_y
+	fetcht 2,mem_shutter_move_data_y
+	setarg 0xfff
+	isub temp,pdata
+	arg IPHONE_ONCE_MAX_MOVE_VALUE,temp
+	isub temp,temp
+	nbranch p_move_data_store, positive
+	setarg 0xfff
+	isub temp,pdata
+	fetcht 1,mem_shutter_iphone_beyond_y_count
+	sub temp,0x05,null
+	branch p_clear_move_y,zero
+	increase 1,temp
+	storet 1,mem_shutter_iphone_beyond_y_count
+	branch p_move_store_y
+
+p_clear_move_y:
+	jam 0,mem_shutter_iphone_beyond_y_count
+	setarg 0xfff
+	branch p_move_store_y
+
+p_move_android_up_check_y:
+	call p_every_move_size_set
+	fetch 2,mem_shutter_move_data_y
+	isub temp,null
+	nrtn positive//if move_x to zero,rtn
+	isub temp,pdata
+	store 2,mem_shutter_move_data_y
+	branch p_move_data_store
+
+
+p_move_down:
+	call shutter_dy_check_iphone
+	branch p_move_android_down, blank
+p_move_down_ios_down:
+	call p_every_move_size_set
+	fetch 2,mem_shutter_move_data_y
+	iadd temp,pdata
+	arg 0xfff,temp
+	isub temp,rega
+	branch p_move_y_empty_check,positive
+	branch p_move_store_y
+
+p_move_android_down:
+	call p_every_move_size_set
+	fetch 2,mem_shutter_move_data_y
+	iadd temp,pdata
+	arg 0xfff,temp
+	call ceiling
+	branch p_move_store_y
+
+p_move_y_empty_check:
+	call shutter_dy_check_iphone
+	branch p_android_move_y_empty_check,blank
+	fetch 1,mem_shutter_iphone_beyond_y_count
+	branch p_android_move_y_empty_check, blank
+	increase -1,pdata
+	store 1,mem_shutter_iphone_beyond_y_count
+	setarg 0xfff
+	arg IPHONE_ONCE_MAX_MOVE_VALUE,temp
+	isub temp,pdata
+	iadd rega,pdata
+p_move_store_y:
+	store 2,mem_shutter_move_data_y
+	branch p_move_data_store
+
+p_android_move_y_empty_check:
+	setarg 0xfff
+	branch p_move_store_y
+
+p_clear_move_x:
+	jam 0,mem_shutter_iphone_beyond_x_count
+	arg 0,pdata
+	branch p_move_store_x
+
+p_every_move_size_set:
+	arg ANDROID_EVERY_MOVE_SIZE,temp
+	call shutter_dy_check_iphone
+	rtn blank
+	arg IPHONE_EVERY_MOVE_SIZE,temp
+	rtn
+
+p_move_x_check_max:
+	fetch 2,mem_shutter_move_data_x
+	arg IPHONE_ONCE_MAX_MOVE_VALUE,temp
+	isub temp,temp
+	nrtn positive
+	copy temp,pdata
+	fetcht 1,mem_shutter_iphone_beyond_x_count
+	sub temp,0x03,null
+	branch p_clear_move_x,zero
+	increase 1,temp
+	storet 1,mem_shutter_iphone_beyond_x_count
+	branch p_move_store_x
+
+p_move_android_data_store:
+	fetch 2,mem_shutter_move_data_x
+	fetcht 2,mem_shutter_move_data_y
+	lshift16 temp,temp
+	iadd temp,pdata
+	store 4,mem_shutter_move_data
+	call p_get_move_data
+	branch p_get_move_release_data
+
+p_get_move_data:
+	call shutter_dy_check_iphone
+	nbranch p_get_move_data_iphone,blank
+	setarg 0x17
+	mul32 pdata,EVERY_PAYLOAD_LEN,pdata
+	arg mem_shutter_mousekey_value_list,temp
+	iadd temp,contw
+	increase 4,contw
+	fetch 4,mem_shutter_move_data
+	istore 4,contw
+	branch shutter_dy_store_move_config_info
+
+p_get_move_release_data:
+	call shutter_dy_check_iphone
+	nbranch p_get_move_data_iphone,blank
+	setarg 0x34
+	mul32 pdata,EVERY_PAYLOAD_LEN,pdata
+	arg mem_shutter_mousekey_value_list,temp
+	iadd temp,contw
+	increase 4,contw
+	fetch 4,mem_shutter_move_data
+	istore 4,contw
+	rtn
+
+p_get_move_data_iphone:
+	setarg 4
+	mul32 pdata,EVERY_PAYLOAD_LEN,pdata
+	arg mem_shutter_mousekey_value_list,temp
+	iadd temp,contw
+	increase 3,contw
+	fetch 2,mem_shutter_move_data_x
+	istore 3,contw
+	increase 7,contw
+	fetch 2,mem_shutter_move_data_y
+	lshift4 pdata,pdata
+	lshift8 pdata,pdata
+	istore 3,contw
+	branch shutter_dy_store_move_config_info
+
 p_soft_reset:
 	nbranch soft_reset+1,wake
 	until null,lpo_edge
@@ -105,37 +515,6 @@
 	copy rega,temp
 	branch lpm_adjust_clk+6
 
-p_shutter_dy_keyscan_key_check_long_press:
-	call p_shutter_dy_long_key_function
-	fetch 1,mem_move_mode_set
-	beq MOVE_COMBINE_KEY,shutter_dy_key_long_press_set_key_normal
-	beq MOVE_SINGLE_KEY,shutter_dy_key_long_press_set_move_trigger
-	rtn
-
-p_shutter_dy_long_key_function:
-	copy queue,pdata
-	beq SHUTTER_LIKE_KEY_NUM,shutter_dy_link_key_long_press
-	beq SHUTTER_DOWN_KEY_NUM,shutter_dy_loop_send_volume_dec_page
-	beq SHUTTER_UP_KEY_NUM,shutter_dy_loop_send_volume_inc_page
-	rtn
-
-p_shutter_dy_key_press:
-	fetch 1,mem_shutter_link_loop_flag
-	nbranch shutter_dy_key_value_filter,blank
-p_shutter_dy_key_press_next:	
-	jam 1,mem_shutter_key_pressed
-	call app_led_on
-	call shutter_dy_key_press_clk
-	call shutter_dy_jude_queue_size
-	branch shutter_dy_over_clear,positive
-	copy queue,pdata
-	fetcht 1,mem_last_press_key_value
-	isub temp,null
-	ncall p_shutter_dy_iphone_check_move_mid,zero
-	fetch 1,mem_move_mode_trigger_enable
-	ncall p_shutter_short_key_cancel,blank
-	branch shutter_dy_key_press_next+9
-
 p_shutter_short_key_cancel:
 	copy queue,pdata
 	beq SHUTTER_MOVE_KEY_NUM,p_move_mode_disable
@@ -143,7 +522,7 @@
 
 p_move_mode_disable:
 	jam 0,mem_move_mode_trigger_enable
-	branch app_led_off	
+	branch app_led_off
 
 p_shutter_dy_iphone_check_move_mid:
 	fetch 1,mem_move_mode_trigger_enable
@@ -162,14 +541,14 @@
 	branch shutter_dy_android_like_loaction_mid
 
 p_le_rx_dec:
-	call le_check_retransmit	
+	call le_check_retransmit
 	fetchr rega, 1,mem_le_rxbuf_data_length
 	increase -4,rega
 	nbranch le_crc_fail_consecutive,positive
 	branch le_rx_dec+6
 
 p_le_rx_nopayload:
-	parse demod,bucket,24	
+	parse demod,bucket,24
 	rshift32 pdata,pdata
 	rshift16 pdata,pdata
 	istore 3,contw
@@ -210,11 +589,11 @@
 	increase -2,contr
 	ifetch 1,contr
 	beq ATTOP_FIND_BY_TYPE_VALUE_REQUEST,p_shutter_dy_not_iphone_read_conf
-	rtn	
+	rtn
 
 p_shutter_dy_not_iphone_read_conf:
 	call p_shutter_dy_remote_not_iphone
-	branch shutter_dy_load_move_config_info	
+	branch shutter_dy_load_move_config_info
 
 p_shutter_dy_remote_not_iphone:
 	jam 1,mem_shutter_back_count
@@ -222,7 +601,7 @@
 	jam 0,mem_last_shutter_le_iphone_flag
 	jam 10,mem_send_data_delay
 	rtn
-	
+
 p_shutter_dy_shutter_key_release:
 	fetch 1,mem_move_mode_trigger_enable
 	call shutter_dy_key_release_led,blank
@@ -265,19 +644,19 @@
 
 
 p_set_sync_on:
-	jam 0x60,0x8a0f 
-	jam 0xaa,0x8a10 
-	jam 0x7a,0x8a12 
-	jam 0x00,0x8a25 
-	jam 0x00,0x8a26 
+	jam 0x60,0x8a0f
+	jam 0xaa,0x8a10
+	jam 0x7a,0x8a12
+	jam 0x00,0x8a25
+	jam 0x00,0x8a26
 	nop 60
-	jam 0x20,0x8a20 
-	jam 0xf5,0x8a23 
-	jam 0x12,0x8a24 
-	jam 0x10,0x8a24 
+	jam 0x20,0x8a20
+	jam 0xf5,0x8a23
+	jam 0x12,0x8a24
+	jam 0x10,0x8a24
 	nop 60
-	jam 0x60,0x8a12 
-	jam 0xdd,0x8a23 
+	jam 0x60,0x8a12
+	jam 0xdd,0x8a23
 	rtn
 
 p_set_ck2rfp11:
@@ -290,11 +669,11 @@
 	jam 0,mem_le_testtype
 	jam 0,mem_cmd_le_create_conn
 	until null,lpo_edge
-	
+
 	jam 0x0d,0x8946
 	jam 0x10,0x896f
 
-	jam 0xcd,0x8a13	
+	jam 0xcd,0x8a13
 	jam 0x10,0x8a06
 	jam 0x4a,0x8a84
 	jam 0x40,0x8a85
@@ -305,7 +684,7 @@
 	call wdt_set_disable,blank
 	ncall p_set_ck2rfp11,wake
 	until null,lpo_edge
-	jam 0x5f,0x813b 
+	jam 0x5f,0x813b
 	fetch 1,mem_fcomp_div
 	beq XTAL_16M,p_initialize_radio_16m
 	fetch 1,mem_ring_ibias_trim
@@ -315,10 +694,10 @@
 	jam 0x24,0x8a80
 	jam 0x62,0x8a81
 	setarg 0xe61212
-	store 3,0x8a73	
+	store 3,0x8a73
 p_initialize_radio2:
 	jam 0x60,0x8a86
-	jam 0x3b,0x8a8b 
+	jam 0x3b,0x8a8b
 	call p_dpll_on
 	jam 0,core_config
 	jam CLKSEL_DPLL,core_clksel
@@ -328,10 +707,15 @@
 	call p_rx_dcoc
 	call p_rfpll_aac_ghpc
 	call p_set_xtal_cap
+	jam 0x06,0x8a30
+	jam 0xdd,0x8a32
+	jam 0xe0,0x8a88
+	jam 0x2d,0x8a8c
+	jam 0x78,0x8a31
 	jam SYSTEM_CLK_12M,mem_system_clk
 	call sadc_calibration
 	branch p_dpll_ring_ibias_calc
-	
+
 p_set_xtal_cap:
 	rtn wake
 	until null,lpo_edge
@@ -339,7 +723,7 @@
 	store 1,core_xtal_cap
 	until null,lpo_edge
 	rtn
-	
+
 p_dpll_on:
 	fetch 1,mem_fcomp_div
 	beq XTAL_24M,p_dpll_on_24m
@@ -347,7 +731,7 @@
 	or_into 0x06,pdata
 	store 1,0x8a02
 	jam 0xe0,0x8a05
-p_dpll_on_24m:	
+p_dpll_on_24m:
 	jam 0xd8,0x8a00
 	nop 60
 	jam 0xa0,0x8a01
@@ -356,7 +740,7 @@
 	nop 20
 	jam 0x9f,0x8a00
 	rtn
-	
+
 p_initialize_radio_16m:
 	fetch 1,mem_ring_ibias_trim
 	or_into 0x06,pdata
@@ -367,19 +751,19 @@
 	setarg 0xe40909
 	store 3,0x8a73
 	jam 0x2a,0x8a76
-	jam 0x04,0x8902	
-	branch p_initialize_radio2	
+	jam 0x04,0x8902
+	branch p_initialize_radio2
 
-p_set_tx_power:	
+p_set_tx_power:
 	fetch 1,mem_tx_power
 	beq TX_POWER_10DB,p_set_tx_power_10db
 	branch set_tx_power+2
-	
+
 p_set_tx_power_10db:
-	jam 0x25,0x8a14 
+	jam 0x25,0x8a14
 	setarg 0xa93f3f
 	store 3,0x8a60
-	jam 0x1f,0x8a63 
+	jam 0x1f,0x8a63
 	rtn
 
 p_set_otp_config:
@@ -391,7 +775,7 @@
 	and pdata,0xf0,pdata
 	fetcht 1,mem_otp_core_ldo
 	ior temp,pdata
-	store 1,0x8136 
+	store 1,0x8136
 	until null,lpo_edge
 
 	fetch 1,0x8138
@@ -399,9 +783,9 @@
 	fetcht 1,mem_otp_verf_bg
 	lshift3 temp,temp
 	ior temp,pdata
-	store 1,0x8138 
+	store 1,0x8138
 	until null,lpo_edge
-	
+
 p_set_otp_config2:
 	fetch 1,0x8acb
 	and pdata,0xf0,pdata
@@ -416,7 +800,7 @@
 	fetch 1,0x8a06
 	setflag true,7,pdata
 	store 1,0x8a06
-	
+
 	fetch 1,mem_otp_dpll_ibais
 	and pdata,7,temp
 	lshift4 temp,temp
@@ -427,7 +811,7 @@
 	ior temp,pdata
 	store 1,0x8a02
 	rtn
-	
+
 p_set_otp_config_wake:
 	fetch 2,mem_otp_charge_pump_x
 	rtn blank
@@ -451,15 +835,15 @@
 	jam 0x30,0x8a26
 	jam 0xfe,0x8a16
 	branch rf_rx_enable+14
-	
+
 p_txon:
 //	bpatch patch03_0,mem_patch03
 	setarg 0x0aaa7e
 	store 3,0x8a0f
 	nop 60
-	jam 0x00,0x8a25 
-	jam 0x0d,0x8a26 
-	jam 0xf6,0x8a16 
+	jam 0x00,0x8a25
+	jam 0x0d,0x8a26
+	jam 0xf6,0x8a16
 	branch txon+7
 
 p_otp_read_data:
@@ -493,18 +877,19 @@
 	rtn
 p_shutter_gpio_config_input_pd:
 	set1 gpio_active_bit,temp
-	branch gpio_config_input	
+	branch gpio_config_input
 
 p_shutter_dy_init:
 	call enable_authrom
 	rtn wake
+	call app_param_init
 	jam 0x0a,mem_lpm_overhead
 	call shutter_dy_key_conf
 	call shutter_dy_adv_conf
 
 	setarg p_shutter_dy_process_idle
 	store 2,mem_cb_idle_process
-		
+
 	setarg p_shutter_dy_process_bb_event
 	store 2,mem_cb_bb_event_process
 
@@ -526,7 +911,7 @@
 	setarg shutter_dy_key_change
 	store 2,mem_cb_shutter_keycan
 
-	call p_shutter_common_init+4	
+	call p_shutter_common_init+4
 
 	branch shutter_dy_init+15
 
@@ -540,13 +925,13 @@
 
 	setarg p_shutter_soft_swtich_power_on
 	store 2,mem_shutter_soft_switch_poweron_callback_function
-	
+
 	setarg shutter_soft_swtich_power_off
 	store 2,mem_shutter_soft_switch_poweroff_callback_function
 
 	jam 7,mem_version
 	call le_modified_name_adv
-	call shutter_init_param	
+	call shutter_init_param
 	call keyscan_key_init
 	call queue_init
 	branch ui_led_init_global
@@ -574,7 +959,7 @@
 	call shutter_dy_iphone_move_mid_timer
 	call shutter_dy_clear_key_state_timer
 	call shutter_check_sleep_timer
-	branch shutter_dy_check_power_off_timer	
+	branch shutter_dy_check_power_off_timer
 
 p_shutter_dy_process_bb_event:
 	copy regc,pdata
@@ -618,12 +1003,12 @@
 	nbranch p_parameter_updata_response_ios,blank
 	fetch 8,mem_ble_shutter_dy_interval_min_new
 	store 8,mem_le_interval_min
-	branch le_l2cap_tx_update_req	
+	branch le_l2cap_tx_update_req
 
 p_parameter_updata_response_ios:
 	fetch 8,mem_ble_shutter_dy_interval_min_ios
 	store 8,mem_le_interval_min
-	branch le_l2cap_tx_update_req	
+	branch le_l2cap_tx_update_req
 
 p_shutter_dy_process_idle:
 	call shutter_dy_shutter_send_data_to_master
@@ -635,7 +1020,7 @@
 	call timer_init
 	disable user
 	call keyscan_process_lpm_before
-	branch p_shutter_dy_keyscan_key_process	
+	branch p_shutter_dy_keyscan_key_process
 
 p_shutter_dy_keyscan_key_process:
 	fetch 2,mem_key_value_xmem
@@ -643,12 +1028,12 @@
 	call shutter_dy_keyscan_key_process_next
 	fetch 2,mem_key_value_retention
 	store 2,mem_key_value_xmem
-	
+
 	arg 0,queue
 	fetch 1,mem_shutter_key_num
 	copy pdata,loopcnt
 	arg mem_shutter_key_state0,regc
-p_shutter_dy_keyscan_key_check_release_loop:	
+p_shutter_dy_keyscan_key_check_release_loop:
 	copy loopcnt,pdata
 	store 2,mem_temp
 	copy regc,pdata
@@ -656,13 +1041,13 @@
 	copy queue,pdata
 	store 2,mem_temp+2
 	call p_shutter_dy_keyscan_key_check_release
-	
+
 	fetch 2,mem_regc
 	copy pdata,regc
-	fetch 2,mem_temp+2	
+	fetch 2,mem_temp+2
 	copy pdata,queue
 	call shutter_dy_keyscan_key_check_long_press
-	
+
 	fetch 2,mem_temp+2
 	add pdata,1,queue
 	fetch 2,mem_regc
@@ -682,7 +1067,7 @@
 	ncall ui_timer_timeout,positive
 	setarg 1000 //100ms 320
 	isub temp,null
-	branch p_shutter_dy_push_queue_release	
+	branch p_shutter_dy_push_queue_release
 p_shutter_dy_push_queue_release:
 	add regc,4,contr
 	ifetch 1,contr
@@ -700,21 +1085,21 @@
 p_shutter_dy_le_get_release_ptr:
 p_shutter_dy_le_get_release_ptr_set:
 	arg mem_key0_release_new,regc
+	jam 30,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
-	rtneq SHUTTER_LIKE_KEY_NUM
-	jam 230,mem_send_data_delay
-	rtn	
+	jam 60,mem_send_data_delay
+	rtn
+
 
 p_rx_dcoc:
 //	bpatch patch01_7,mem_patch01
 	rtn wake
 	call set_sync_on
 	arg 39,temp
-	call set_freq_rx	
+	call set_freq_rx
 	call rf_rx_enable
 	jam 0x7f,0x8a25
 	jam 0x1a,0x8a30
@@ -750,7 +1135,7 @@
 	store 2,0x8984
 	jam 0x9,0x8981
 	jam 0x3,0x8981
-	jam 0x6,0x8980	
+	jam 0x6,0x8980
 	nop 60
 	arg 0,rega
 	arg 0,regb
@@ -761,7 +1146,7 @@
 p_rfpll_aac_ghpc:
 	rtn wake
 	branch rfpll_aac_ghpc+1
-	
+
 p_dpll_ring_ibias_calc:
 	rtn
 
@@ -820,7 +1205,7 @@
 	storet 2,mem_adc_current_value
 	jam 0x00,core_sadc_ctrl
 	rtn
-	
+
 
 
 p_set_lemode:
@@ -864,9 +1249,9 @@
 	rtneq LLID_RESERVED
 	beq LLID_LE_LL,le_parse_ll
 	branch le_parse_l2cap
-	
+
 p_le_init_adv:
-	set0 mark_ble_crc_fail,mark	
+	set0 mark_ble_crc_fail,mark
 	branch le_init_adv+1
 
 p_lpm_sleep:
@@ -902,7 +1287,7 @@
 	branch p_lpm_write_gpio_loop_next,zero
 	istore 1,regc
 	until null,lpo_edge
-p_lpm_write_gpio_loop_next:	
+p_lpm_write_gpio_loop_next:
 	increase 1,rega
 	increase 1,regc
 	loop p_lpm_write_gpio_loop
Index: sched/shutter_dy.dat
===================================================================
--- /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/sched/shutter_dy.dat	(revision 6444)
+++ /1121s/branch/shutter/branch/dy/JXY/yc1089s_jxy_pacb217_7key/sched/shutter_dy.dat	(working copy)
@@ -51,9 +51,9 @@
 #hard_soft_switch config
 mem_shutter_hard_soft_switch_case_temp:01
 mem_shutter_soft_switch_button_gpio_temp:06
-#mem_shutter_soft_switch_button_gpio_temp:12
+# mem_shutter_soft_switch_button_gpio_temp:12
 
-#100ms timer 
+#100ms timer
 mem_shutter_ble_discovery_time_conf:
 28 23 #discovery_timeout
 50 46 #connect_timeout
@@ -72,14 +72,15 @@
 #14   #up
 #07   #left
 
-#test 7key
-# 06   #right
-# 15   #like
-# 08   #down
-# 0a   #photo
-# 14   #up
-# 07   #left
-# 0d   #move
+#dy socket
+# 08   #right
+# 07   #like
+# 0f   #down
+# 12   #photo
+# 02   #up
+# 06   #left
+# 0e   #move
+
 
 #jxy_pcb217
 07   #right
@@ -137,34 +138,42 @@
 40 00
 
 mem_shutter_iphone_move_mid:
-15 15 1a 16 12 12 00
+# 15 15 1a 16 12 12 00
+00
 mem_shutter_iphone_up_mid:
-15 15 1a 39 12 12 00
+# 15 15 1a 39 12 12 00
+00
 mem_shutter_iphone_like_mid:
-15 15 1a 3a 12 12 
+# 15 15 1a 3a 12 12
+00
 mem_shutter_android_move_mid:
-13 38 12 12 00
+# 13 38 12 12 00
+00
 
 mem_key0_press_i:  #right
 00
 mem_key0_release_new_i:
-0e 11 11 12 2c 2e 2f 30 32 33 0f 0f 00
+# 0a 0e 0e 0e 0b 0d 0d 0d 00
+22 23 24 25 26 27 28 29 2a 2b
 mem_key0_long_press_i:
-3c 37 00
+33 09 00
 
 mem_key1_press_i:#like
-0e 2a 12 2b 00
+00
 mem_key1_release_new_i:
-12 12 00
+# 0a 0b 00
+1c 2c 00
 
 mem_shutter_link_data_i:
-0e 12 12 0e 12 12 00
+# 0a 0b 0a 0b 00
+1c 2c 1c 2c 00
 
 mem_key2_press_i:#down
 00
 mem_key2_release_new_i:
-0e 14 14 14 12 22 23 24 25 17 17 17 00
-#0e 14 14 12 22 23 24 25 26 29 17 17 00
+# 0a 10 10 10 0b 0f 0f 0f 00
+20 1f 1e 1d 1c 1b 1a 19 21
+
 
 #toggle between vol-inc and vol-dec
 mem_key3_press_i:#photo
@@ -184,41 +193,44 @@
 mem_key4_press_i:#up
 00
 mem_key4_release_new_i:
-0e 17 17 17 12 29 26 25 24 23 14 14 14 00
-#0e 17 17 12 29 26 25 24 23 22 34 14 14 00
+# 0a 0f 0f 0f 0b 10 10 10 00
+19 1a 1b 1c 1d 1e 1f 20 21
 
 mem_key5_press_i:#left
 00
 mem_key5_release_new_i:
-0e 0f 0f 12 32 31 2f 2e 2c 35 11 11 00
+# 0a 0d 0d 0d 0b 0e 0e 0e 00
+2b 2a 29 28 27 26 25 24 23 22
+
 mem_key5_long_press_i: #lock
-36 37 00
+32 09 00
 
 
 mem_key6_release_new_i:#move
-0e 2a 12 2b 12 00
+# 0e 2a 12 2b 12 00
+0a 0b 00
 mem_key6_release_new:#move
-0e 12 12 12 12 00
+18 35 00
 
 mem_dy_key0_press:  #right
 00
 mem_key0_release_new:
-10 0b 0e 1d 1d 1d 12 00
-# mem_key0_long_press: 
-# 3b 37 00
+23 24 25 26 27 28 29 2a 2b
+mem_key0_long_press:
+# 34 09 00
 
 mem_dy_key1_press:#like
-0e 12 12 00
+00
 mem_key1_release_new:
-12 12 00
-
+1c 2c 00
+# 18 36 00
 mem_shutter_link_data:
-0e 12 12 0e 12 12 12 00
+1c 2c 1c 2c 00
 
 mem_dy_key2_press: #down
 00
 mem_key2_release_new:
-13 18 0e 1e 0c 0c 0c 0c 12 13 18 00
+20 1f 1e 1d 1c 1b 1a 19 21
 mem_key2_long_press:#volume decrement
 08 09 00
 mem_key2_long_release:
@@ -243,8 +255,8 @@
 mem_dy_key4_press:#up
 00
 mem_key4_release_new:
-15 19 0e 0d 0d 0d 0d 12 15 19 00
-mem_key4_long_press:#volume increment
+19 1a 1b 1c 1d 1e 1f 20 21
+mem_key4_long_press:
 07 09 00
 mem_key4_long_release:
 00
@@ -253,16 +265,16 @@
 mem_dy_key5_press:#left
 00
 mem_key5_release_new:
-15 0a 0e 1c 1c 1c 12 12 00
+2a 29 28 27 26 25 24 23 22
 mem_key5_long_press: #lock
-36 37 00
+32 09 00
 
 mem_combine_key0_press:
 01
 mem_combine_key1_press:
 02
 mem_combine_key2_press:
-03 
+03
 mem_combine_key3_press:
 04
 mem_combine_key_release:
@@ -276,79 +288,80 @@
 
 ################ble kb val list#######################
 mem_shutter_mousekey_value_list:
-03 1f 00 ec 0f 00 00 00 00 00#1
-03 1f 00 14 00 00 00 00 00 00#2
-03 1f 00 00 c0 fe 00 00 00 00#3
-03 1f 00 00 40 01 00 00 00 00#4
-03 1f 00 00 00 00 00 00 00 00#5
-03 1f 00 00 00 00 00 00 00 00#6
-02 1b 00 01 00 00 00 00 00 00#7 volume increment
-02 1b 00 02 00 00 00 00 00 00#8 volume decrement
-02 1b 00 00 00 00 00 00 00 00#9 release
-03 1f 00 28 f0 15 00 00 00 00#a
-#03 1f 00 28 80 11 00 00 00 00#a
-03 1f 00 ae ff 15 00 00 00 00#b
-#03 1f 00 ae 8f 11 00 00 00 00#b
-#03 1f 00 00 e0 fc 00 00 00 00 #c
-03 1f 00 00 e0 f9 00 00 00 00 #c
-03 1f 00 00 00 0a 00 00 00 00 #d
-#03 1f 00 00 00 05 00 00 00 00 #d
-03 17 00 01 00 00 00 00 00 00#e
-03 1f 00 27 00 00 00 00 00 00#f
-03 1f 00 ff 17 80 00 00 00 00#10
-03 1f 00 d8 0f 00 00 00 00 00#11
-03 17 00 00 00 00 00 00 00 00#12
-03 1f 00 01 f8 7f 00 00 00 00#13
-03 1f 00 00 40 fc 00 00 00 00#14
-03 1f 00 01 18 80 00 00 00 00#15
-03 1f 00 3c 40 13 00 00 00 00#16
-#03 1f 00 3c 40 0b 00 00 00 00#16
-03 1f 00 00 c0 03 00 00 00 00#17
-03 1f 00 6c 40 f0 00 00 00 00 #18
-#03 1f 00 1c 40 ec 00 00 00 00 #18
-#03 1f 00 3c 82 0c 00 00 00 00 #19
-03 1f 00 6c 80 0a 00 00 00 00 #19
-03 1f 00 00 10 80 00 00 00 00#1a
-03 1f 00 3c 80 07 00 00 00 00#1b
-03 1f 00 96 00 00 00 00 00 00#1c
-03 1f 00 6a 0f 00 00 00 00 00#1d
-03 1f 00 02 d0 ff 00 00 00 00#1e
-03 1f 00 02 30 00 00 00 00 00#1f
-03 1f 00 64 00 00 00 00 00 00#20
-03 1f 00 00 b0 f9 00 00 00 00#21
-07 13 00 07 06 70 07 ac 0d 01#22
-07 13 00 07 06 70 07 80 0c 01#23
-07 13 00 07 06 70 07 54 0b 01#24
-07 13 00 07 06 70 07 28 0a 01#25
-07 13 00 07 06 70 07 fc 08 01#26
-07 13 00 07 06 70 07 d0 07 01#27
-07 13 00 07 06 70 07 a4 06 01#28
-07 13 00 00 06 70 07 78 05 00#29
-07 13 00 07 07 70 07 70 07 01#2a
-07 13 00 00 07 70 07 70 07 00#2b
-07 13 00 07 05 10 0c 70 04 01#2c
-07 13 00 07 05 48 0b 70 04 01#2d
-07 13 00 07 05 F0 0A 70 04 01#2e
-07 13 00 07 05 C4 09 70 04 01#2f 
-07 13 00 07 05 6C 07 70 04 01#30
-07 13 00 07 05 40 04 70 04 01#31
-07 13 00 07 05 E8 02 70 04 01#32
-07 13 00 00 05 00 02 70 04 00#33
-07 13 00 00 06 70 07 ac 0e 00#34
-07 13 00 00 05 10 0d 70 04 00#35
-02 1b 00 04 00 00 00 00 00 00#36 #lock
-02 1b 00 00 00 00 00 00 00 00#37
-03 1f 00 a0 30 e8 00 00 00 00#38
-03 1f 00 3c 40 07 00 00 00 00#39
-03 1f 00 41 40 0b 00 00 00 00#3a
-02 1b 00 10 00 00 00 00 00 00#3b #home
-#08 27 00 00 00 00 00 00 00 00 00#3c
-#08 27 00 09 00 00 00 00 00 00 00#3d
-#08 27 00 09 00 14 00 00 00 00 00#3e
-02 1b 00 08 00 00 00 00 00 00#3c #home		
+03 1f 00 ec 0f 00 00 00 00 00 #1
+03 1f 00 14 00 00 00 00 00 00 #2
+03 1f 00 00 c0 fe 00 00 00 00 #3
+03 1f 00 00 40 01 00 00 00 00 #4
+03 1f 00 00 00 00 00 00 00 00 #5
+03 1f 00 00 00 00 00 00 00 00 #6
+02 1b 00 01 00 00 00 00 00 00 #7 volume increment
+02 1b 00 02 00 00 00 00 00 00 #8 volume decrement
+02 1b 00 00 00 00 00 00 00 00 #9 release
+
+03 17 00 01 00 00 00 00 00 00 #0a
+03 17 00 00 00 00 00 00 00 00 #0b
+03 1f 00 00 00 00 00 00 00 00 #0c
+03 1f 00 27 00 00 00 00 00 00 #0d ios left
+03 1f 00 d8 0f 00 00 00 00 00 #0e ios right
+03 1f 00 00 c0 03 00 00 00 00 #0f  ios up
+03 1f 00 00 40 fc 00 00 00 00 #10 ios down
+
+03 1f 00 01 f8 7f 00 00 00 00 #11
+03 1f 00 01 18 80 00 00 00 00 #12
+03 1f 00 00 10 80 00 00 00 00 #13
+03 1f 00 3c 00 0e 00 00 00 00 #14
+
+03 1f 00 02 30 00 00 00 00 00 #15
+03 1f 00 64 00 00 00 00 00 00 #16
+03 1f 00 00 b0 f9 00 00 00 00 #17
+
+05 23 00 07 00 00 00 00 00 00 #18
+05 23 00 07 f0 04 f0 02 00 00 #19
+05 23 00 07 f0 04 1c 04 00 00 #1a
+05 23 00 07 f0 04 48 05 00 00 #1b
+05 23 00 07 f0 04 74 06 00 00 #1c like press
+05 23 00 07 f0 04 a0 07 00 00 #1d
+05 23 00 07 f0 04 cc 08 00 00 #1e
+05 23 00 07 f0 04 f8 09 00 00 #1f
+05 23 00 07 f0 04 24 0b 00 00 #20
+05 23 00 00 f0 04 24 0b 00 00 #21
+
+05 23 00 00 f0 07 60 06 00 00#22
+05 23 00 07 a3 06 50 06 00 00#23
+05 23 00 07 66 05 50 06 00 00#24
+05 23 00 07 2c 04 60 06 00 00#25
+05 23 00 07 02 03 50 06 00 00#26
+05 23 00 07 e2 02 50 06 00 00#27
+05 23 00 07 44 02 60 06 00 00#28
+05 23 00 07 73 01 50 06 00 00#29
+05 23 00 07 03 01 50 06 00 00#2a
+05 23 00 00 01 00 60 06 00 00#2b
+
+05 23 00 04 f4 01 cc 01 00 00 #2c like release
+
+03 1f 00 3c 40 07 00 00 00 00 #2d
+03 1f 00 41 40 0b 00 00 00 00 #2e
+
+02 27 00 30 00 00 00 00 00 00 #2f
+02 27 00 00 00 00 00 00 00 00 #30
+03 1f 00 00 f0 7f 00 00 00 00 #31 down
+
+02 1b 00 04 00 00 00 00 00 00 #32 lock
+02 1b 00 08 00 00 00 00 00 00 #33 ios home
+02 1b 00 10 00 00 00 00 00 00 #34 android home
+
+05 23 00 06 00 00 00 00 00 00 #35
+
+05 23 00 00 00 00 00 00 00 00 #36
+03 1f 00 00 40 00 00 00 00 00 #37
+03 1f 00 3c 40 04 00 00 00 00 #38
+03 1f 00 3c 40 15 00 00 00 00 #39
+03 1f 00 00 10 80 00 00 00 00 #3a
+03 1f 00 00 c0 ff 00 00 00 00 #3b
+07 13 00 07 06 70 07 ac 0d 01 #3c
 
 mem_shutter_move_data:
-00 00 00  #defualt 
+00 00 00  #defualt
 
 #mem_le_dy_adv_data:
 #02 01 05
@@ -372,40 +385,40 @@
 #attribute list: handle 2bytes, uuid 2bytes, length 1bytes, attribute Nbytes
 mem_shutter_le_uuid_sup:
 #Primary service GATT ------
-01 00 02 00 28 02 01 18 
+01 00 02 00 28 02 01 18
 #Service changed
-02 00 02 03 28 01 20 
+02 00 02 03 28 01 20
 03 00 02 05 2a 01 00
 #Client Characteristic Configuration
-04 00 02 02 29 02 00 00 
+04 00 02 02 29 02 00 00
 
 #Primary service GAP ------
 05 00 02 00 28 02 00 18
 
 #Device name
-06 00 02 03 28 01 02 
+06 00 02 03 28 01 02
 07 00 02 00 2a 13 43 68 69 70 73 65 61 2d 42 4c 45 20 20 20 20 20 20 20 20
 
 #Appearance
-08 00 02 03 28 01 02 
-09 00 02 01 2a 02 c1 03 
+08 00 02 03 28 01 02
+09 00 02 01 2a 02 c1 03
 
 #Peripheral Preferred Connection Parameters
-0a 00 02 03 28 01 02 
+0a 00 02 03 28 01 02
 0b 00 02 04 2a 08 06 00 06 00 64 00 2c 01 # interval 6ms, latency 100, timeout 300
 
 #Primary service device information ------
-0c 00 02 00 28 02 0a 18 
+0c 00 02 00 28 02 0a 18
 #PNP id
-0d 00 02 03 28 01 02 
+0d 00 02 03 28 01 02
 0e 00 02 50 2a 07 01 05 0e 00 0a 02 40
 
 #Primary service hid ------
-0f 00 02 00 28 02 12 18 
+0f 00 02 00 28 02 12 18
 
 #Protocol mode
-10 00 02 03 28 01 06 
-11 00 02 4e 2a 01 01 
+10 00 02 03 28 01 06
+11 00 02 4e 2a 01 01
 
 
 #Hid report
@@ -417,18 +430,18 @@
 15 00 02 08 29 02 01 01 # report id=1, type=1 input
 
 #Hid report id 4
-16 00 02 03 28 01 10 
+16 00 02 03 28 01 10
 17 00 02 4d 2a 03 00 00 00
 #Client Characteristic
-18 00 02 02 29 02 00 00 
+18 00 02 02 29 02 00 00
 #Report reference
 19 00 02 08 29 02 04 01 # report id=4, type=1 input
 
 #Hid report id 3
 1a 00 02 03 28 01 10
-1b 00 02 4d 2a 02 00 00 
+1b 00 02 4d 2a 02 00 00
 #Client Characteristic
-1c 00 02 02 29 02 00 00 
+1c 00 02 02 29 02 00 00
 #Report reference
 1d 00 02 08 29 02 03 01 # report id=3, type=1 input
 
@@ -436,44 +449,81 @@
 1e 00 02 03 28 01 10
 1f 00 02 4d 2a 03 00 00 00
 #Client Characteristic
-20 00 02 02 29 02 00 00 
+20 00 02 02 29 02 00 00
 #Report reference
 21 00 02 08 29 02 05 01 # report id=5, type=1 input
 
-#Hid report id 2
-22 00 02 03 28 01 12
-23 00 02 4d 2a 02 00 00 
-#00 00 00 00 00
+#Hid report id 6
+22 00 02 03 28 01 10
+23 00 02 4d 2a 05 00 00 00 00 00
 #Client Characteristic
 24 00 02 02 29 02 00 00
 #Report reference
-25 00 02 08 29 02 02 01 # report id=2, type=1 input
+25 00 02 08 29 02 06 01 # report id=6, type=1 input
 
-#Hid report id 6
+#Hid report id 2
 26 00 02 03 28 01 12
-27 00 02 4d 2a 08 00 00 00 00 00 00 00 00
+27 00 02 4d 2a 02 00 00
+#00 00 00 00 00
 #Client Characteristic
-28 00 02 02 29 02 00 00 
+28 00 02 02 29 02 00 00
 #Report reference
-29 00 02 08 29 02 06 01 # report id=6, type=1 input
+29 00 02 08 29 02 02 01 # report id=2, type=1 input
+
 #Report map
-2a 00 02 03 28 01 02 
+2a 00 02 03 28 01 02
 2b 00 02 4b 2a 01 00
 
 #Hid information
 2c 00 02 03 28 01 02
-2d 00 02 4a 2a 04 11 01 00 01 
+2d 00 02 4a 2a 04 11 01 00 01
 
 #Hid control point
-2e 00 02 03 28 01 04 
-2f 00 02 4c 2a 01 00 
+2e 00 02 03 28 01 04
+2f 00 02 4c 2a 01 00
 30 00 02 00 28 02 0f 18
 
 00 00
-
-mem_shutter_le_map_len_android:72 00 #6d 00
-mem_shutter_le_map_len_ios:c9 00
+mem_shutter_le_map_len_android:76 00
+mem_shutter_le_map_len_ios:21 01
 mem_shutter_le_hid_map:
+05 0d	#Usage Page (Digitizer)
+09 01 	# Usage(Digitizer)
+a1 01 	#Collection (Application)
+85 06	#Report Id (6)
+09 22 	#Usage (Finger)
+a1 02  	#Collection (Logical)
+09 42	#Usage (Tip Switch)
+15 00	#Logical minimum (0)
+25 01 	#Logical maximum (1)
+75 01	#Report Size (1)
+95 01	#Report Count (1)
+81 02 	#Input (Data,Value,Absolute,Bit Field)
+09 32	#Usage (In Range)
+81 02  	#Input (Data,Value,Absolute,Bit Field)
+95 06	#Report Count (2)
+81 03 	#Input (Constant,Array,Absolute,Bit Field)
+05 01	#Usage Page (Generic Desktop)
+#26 e8 03  #Logical maximum (1'000)
+26 ff 0f  #Logical maximum (4'095)
+75 10	#Report Size (16)
+95 01	#Report Count (1)
+55 0E #Unit Exponent (14)
+65 33 #Unit(51)
+#55 00	#Unit Exponent (0)
+#65 00	#Unit (None)
+09 30 	#Usage (X)
+35 00   #Physical Minimum (0)
+#46 e8 04  #Physical maximum (1'000)
+46 b5 04  #Physical maximum (1'205)
+81 02	#Input (Data,Value,Absolute,Bit Field)
+09 31	#Usage (Y)
+#46 e8 03  #Physical maximum (1'000)
+46 8a 03  #Physical maximum (906)
+81 02	#Input (Data,Value,Absolute,Bit Field)
+c0		#End Collection
+c0
+
 05 0c # Usage Page(Consumer) #legth 30
 09 01 # Usage(Consumer Control)
 a1 01 # Collection(Application)
@@ -490,6 +540,20 @@
 81 06 #Input (Data, Variable, Absolute)
 c0 #end
 
+#25
+05 0c
+09 01
+a1 01
+85 02
+19 00
+2a ff 03
+15 00
+26 ff 03
+95 01
+75 10
+81 00
+c0
+
 05 01 #Usage Page (Generic Desktop Controls)
 09 02 # Usage(Mouse)
 a1 01 # Collection(Application)
@@ -518,7 +582,7 @@
 0a 38 02 	#Usage (AC Pan)
 95 01 # Report Count(1)
 81 06 #INPUT (Data, Variable, Relative)
-c0 
+c0
 
 85 05 # Report ID(5)
 09 01 # Usage(Consumer Control)
@@ -533,7 +597,6 @@
 81 06 #Input (Data, Variable, Relative)
 c0 c0
 
-
 05 0D  # Usage Page(Digitizer)
 09 02  # Usage(Pen)
 A1 01 # Collection(Application)
@@ -566,7 +629,7 @@
 46 8A 03 #Physical Maximum (906)
 09 31 #Usage (y)
 81 02 #Input (Data, Variable, Absolute)
-C0 
+C0
 
 05 0D # Usage Page(Digitizer)
 09 54 # Usage(84)
@@ -577,9 +640,10 @@
 09 55 # Usage (Contact count mamimum)
 25 05 # Logical Maximum(5)
 B1 02 #Input (Data, Variable, Absolute)
-C0 
+C0
+
+
 
 ##############BLE ATT LIST END####################
 mem_dy_le_search_service_uuid:
-D0 00 2D 12 1E 4B 0F A4 99 4E CE B5 31 F4 05 79
-
+D0 00 2D 12 1E 4B 0F A4 99 4E CE B5 31 F4 05 79
\ No newline at end of file