Index: output/flash.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/output/flash.dat (revision 5062) +++ /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/output/flash.dat (working copy) @@ -2,16 +2,16 @@ 02 aa 55 -7a +ca 1f 20 20 00 -40 +41 20 40 03 -c1 +87 68 00 c1 @@ -23,7 +23,7 @@ 20 40 07 -4f +0b 68 00 c6 @@ -46,24 +46,28 @@ ca 20 40 -02 -e2 +03 +00 +20 +40 +07 +97 20 40 00 -0e +0f 20 40 00 -21 +22 20 20 -03 -16 +02 +d8 58 00 03 -8a +4d 60 01 4d @@ -71,7 +75,7 @@ 58 00 03 -a4 +67 60 01 41 @@ -79,7 +83,7 @@ 58 00 06 -90 +4d 60 01 41 @@ -87,7 +91,7 @@ 58 00 03 -dc +a2 60 01 41 @@ -95,23 +99,23 @@ 58 00 02 -80 +49 60 01 41 ed 58 00 -04 -17 +03 +da 60 01 41 f5 58 00 -04 -04 +03 +c7 60 01 41 @@ -119,7 +123,7 @@ 58 00 04 -52 +10 60 01 41 @@ -127,7 +131,7 @@ 58 00 04 -59 +12 60 01 41 @@ -147,15 +151,15 @@ 24 55 80 -29 +2a 20 40 02 -e4 +ad 20 40 -03 -0f +02 +d1 68 00 c7 @@ -263,99 +267,99 @@ c2 84 00 -59 +5a c0 00 80 -75 +6c c0 01 00 -7f +76 c0 42 87 -bb +6b c0 44 87 -8c +3e c0 0d 86 -a9 +65 c0 13 06 -ab +67 c0 24 06 -c7 +83 c0 25 06 -ce +8a c0 28 86 -d7 +93 c0 2c 86 -c5 +81 c0 53 86 -dc +98 c0 56 86 -f2 +ae c0 65 b3 e4 c0 74 -87 -03 +86 +bf c0 50 80 -88 +7f c0 58 80 -8d +84 c0 59 00 -9f +96 c0 62 02 -a2 +75 c0 71 85 -6d +2d c0 73 05 -92 +52 c0 75 05 -c8 +85 c0 75 85 -ce +8b c0 76 05 -e2 +9f 20 20 2a @@ -363,115 +367,75 @@ c0 1c 85 -ec +a9 c0 21 85 -f4 +b1 c0 25 05 -fa +b7 c0 2b 85 -fd +ba c0 2c 85 -ff +bc c0 31 -86 -01 +85 +be c0 33 -06 -2b +05 +ef c0 33 86 -42 +06 c0 35 06 -7b +3b c0 3b 86 -86 +43 c0 02 -87 -05 +86 +c1 c0 40 -07 -07 +06 +c3 c0 41 -07 -11 +06 +cd c0 44 -07 -13 +06 +cf c0 46 06 -96 +53 c0 46 86 -a2 +5f c0 7d -07 -37 +06 +f3 20 20 2a 8e -1f -e2 -22 -00 -68 -08 -cc -cb -58 -00 -4c -d2 -98 -40 -8a -00 -1a -22 -7e -00 -e0 -a0 -80 -00 -18 -40 -84 -01 -18 -41 -04 -07 -60 -08 -cc -cb -20 -60 -00 -00 d8 a0 09 @@ -487,7 +451,7 @@ 20 40 03 -9b +5e 20 40 74 @@ -543,7 +507,7 @@ 20 3a 00 -82 +79 20 20 20 @@ -651,23 +615,23 @@ c0 00 80 -b5 +aa 20 40 01 -34 +14 24 34 00 -d0 +c5 20 40 -01 -1b +00 +fb 20 40 01 -5f +3f 68 00 cc @@ -679,11 +643,19 @@ 20 40 07 -60 -20 -40 +12 +58 +01 +77 00 -b1 +60 +01 +cc +3f +70 +4b +5f +14 68 00 cb @@ -691,11 +663,11 @@ c0 00 83 -8d +50 20 40 -00 -dc +02 +53 24 74 00 @@ -703,7 +675,7 @@ 20 40 02 -87 +50 58 00 ec @@ -712,26 +684,10 @@ 20 2b 93 -58 -01 -77 -00 -60 -01 -cc -3f -70 -4b -5f -14 -20 -60 -00 -00 20 40 02 -60 +2c 24 74 00 @@ -739,7 +695,7 @@ 20 40 00 -ca +bf 68 01 4d @@ -763,11 +719,11 @@ 20 42 80 -bf +b4 20 20 00 -a2 +99 70 4d 50 @@ -811,7 +767,7 @@ 20 20 00 -c6 +bb 68 00 cc @@ -827,11 +783,11 @@ c0 02 00 -c8 +bd c0 02 80 -c4 +b9 20 60 00 @@ -843,7 +799,7 @@ 20 5a 00 -e7 +cf 68 00 cb @@ -862,8 +818,8 @@ 00 20 40 -00 -dc +02 +53 24 74 00 @@ -873,61 +829,9 @@ cc 3f 20 -40 -7f -49 -60 -0a -41 -5b -20 -20 -2b -2a -78 -34 -7c -00 -20 -40 -2a -fa -68 -01 -c1 -6f -20 -3a -7f -e9 -68 -00 -c0 -91 -20 -3a -7f -e9 -68 -00 -cd -50 -c0 -00 -ff -e9 -68 -02 -46 -d3 -c3 -82 -00 -00 -20 20 -02 -8a +2d +8c 70 4c 3c @@ -939,7 +843,7 @@ 20 40 00 -fa +df 60 00 cb @@ -979,23 +883,11 @@ 20 40 01 -37 -20 +17 20 -00 -a5 -68 -02 -40 -a0 -60 -02 -4c -47 20 -60 -00 00 +9c 70 4d 46 @@ -1024,26 +916,6 @@ 00 cc 11 -79 -20 -7e -04 -60 -00 -cc -11 -60 -00 -cb -cc -20 -60 -00 -00 -68 -00 -cc -11 c4 02 00 @@ -1066,16 +938,16 @@ cc 20 40 -07 -56 +05 +de 20 20 01 -e4 +be 20 40 -07 -56 +05 +de 70 4d 43 @@ -1083,7 +955,7 @@ 20 20 00 -fa +df 70 4d 48 @@ -1099,15 +971,15 @@ 20 20 00 -fa +df 68 00 cd 47 c0 01 -81 -0f +80 +ef 68 00 cc @@ -1119,19 +991,19 @@ 20 20 80 -f8 +dd 68 00 cd 47 c0 00 -81 -0e +80 +ee c0 01 -01 -0f +00 +ef 20 60 00 @@ -1147,11 +1019,11 @@ 20 40 01 -20 +00 24 56 01 -28 +08 20 60 00 @@ -1195,7 +1067,7 @@ 20 3a 01 -2f +0f 1f e0 ff @@ -1215,7 +1087,7 @@ 20 20 01 -e4 +be 70 4d 47 @@ -1227,7 +1099,7 @@ 24 3a 01 -57 +37 70 4c 55 @@ -1235,7 +1107,7 @@ 20 20 01 -e4 +be 68 00 cc @@ -1243,15 +1115,15 @@ c0 ff 81 -a5 +83 20 40 01 -3a +1a 20 40 01 -d2 +ac 70 4c 15 @@ -1271,7 +1143,7 @@ 20 34 01 -40 +20 68 03 cb @@ -1287,7 +1159,7 @@ 20 40 03 -bb +7e 70 4c 3c @@ -1303,7 +1175,7 @@ 20 40 00 -fa +df 60 00 cb @@ -1371,7 +1243,7 @@ c2 00 01 -50 +30 20 60 00 @@ -1383,7 +1255,7 @@ c0 80 80 -fa +df 68 00 cd @@ -1398,12 +1270,12 @@ 43 c0 02 -01 -0b +00 +eb 20 40 01 -e4 +be 70 4c 55 @@ -1423,27 +1295,27 @@ 20 40 01 -76 +56 24 2c 01 -81 +61 24 37 81 -81 +61 20 40 01 -73 +53 20 40 01 -9e +7c 20 40 07 -52 +0e 68 00 cc @@ -1458,8 +1330,8 @@ 0f 20 40 -01 -03 +00 +e3 68 00 cc @@ -1467,11 +1339,11 @@ c0 ff 81 -a7 +85 20 40 -01 -12 +00 +f2 58 00 00 @@ -1507,7 +1379,7 @@ 20 40 02 -3f +0e 18 00 2a @@ -1535,11 +1407,11 @@ 20 40 01 -fe +ce 20 57 82 -37 +0b 20 60 00 @@ -1579,15 +1451,15 @@ c0 ff 81 -8c +6c 20 40 01 -94 +74 20 20 01 -60 +40 68 00 cc @@ -1611,15 +1483,15 @@ 20 40 07 -83 +35 20 40 -07 -56 +05 +de 20 20 01 -e4 +be 68 00 cc @@ -1631,7 +1503,7 @@ 24 21 01 -91 +71 1f e0 fe @@ -1641,21 +1513,13 @@ cc 19 c0 -01 -00 -fe -c0 03 -01 -05 -c0 -04 00 -fe +e5 c0 06 -01 -05 +00 +e5 20 60 00 @@ -1663,7 +1527,7 @@ 20 40 01 -b7 +91 68 00 cc @@ -1695,11 +1559,7 @@ 20 20 07 -bd -20 -40 -07 -4f +6d 70 11 c5 @@ -1707,15 +1567,7 @@ 20 20 07 -bd -70 -11 -c5 -60 -20 -20 -07 -bd +6d 70 11 c5 @@ -1723,7 +1575,7 @@ 20 20 07 -bd +6d 79 3f 80 @@ -1752,14 +1604,10 @@ a0 4b ac -1a -22 -0c -00 20 20 -7f -01 +2d +51 68 00 cb @@ -1839,7 +1687,7 @@ c2 00 01 -c8 +a2 1a 22 7e @@ -1944,34 +1792,6 @@ 08 cc 1b -20 -40 -01 -e8 -60 -08 -cc -1b -20 -60 -00 -00 -20 -40 -01 -ec -18 -40 -84 -01 -18 -41 -04 -03 -20 -60 -00 -00 68 00 cc @@ -2004,50 +1824,38 @@ 00 cc 1a +18 +40 +84 +01 +18 +41 +04 +03 +60 +08 +cc +1b 20 60 00 00 -78 -44 -fc -00 -78 -43 -fc -00 -58 -55 -55 -55 -98 -00 -1e -00 +20 +40 +2d +ee 68 00 cc 1a -1f -ed -84 -00 -79 20 -04 -01 -18 -43 -1c -00 20 -60 -00 -00 +53 +da 20 40 01 -f5 +cb 78 57 fc @@ -2083,7 +1891,7 @@ 24 2c 02 -3b +0b 78 46 fc @@ -2103,7 +1911,7 @@ 20 40 02 -34 +08 60 00 cc @@ -2119,11 +1927,11 @@ 24 22 82 -37 +0b 20 40 02 -34 +08 60 00 cb @@ -2143,11 +1951,11 @@ 24 20 82 -37 +0b 20 40 02 -34 +08 e0 a0 80 @@ -2162,20 +1970,20 @@ 1f 20 22 -82 -1f +81 +ef 20 40 02 -34 +08 e0 a0 80 00 c2 00 -02 -1c +01 +ec 18 a2 22 @@ -2183,7 +1991,7 @@ 20 40 02 -34 +08 60 00 cd @@ -2223,39 +2031,55 @@ 20 23 02 -37 +0b 78 37 fc 00 -68 -00 -80 -17 -1f -e0 -a2 -00 -20 -40 -29 -81 -78 -46 -fc -00 20 40 -29 -18 +54 +ba 68 00 cd 4b -20 +1f +e2 +22 +00 +68 +08 +cc +cb +58 +00 +4c +d2 +98 40 +8a 00 -6b +1a +22 +7e +00 +e0 +a0 +80 +00 +18 +40 +84 +01 +18 +41 +04 +07 +60 +08 +cc +cb 20 60 00 @@ -2281,30 +2105,10 @@ fc 00 20 -40 +20 26 4d 20 -60 -00 -00 -20 -20 -02 -37 -20 -40 -29 -18 -68 -08 -cc -1a -20 -20 -29 -33 -20 40 53 c4 @@ -2319,11 +2123,19 @@ 20 40 01 -f5 +cb 20 40 -02 -3c +29 +18 +68 +08 +cc +1a +20 +40 +29 +33 79 20 2a @@ -2403,31 +2215,11 @@ c2 00 02 -55 -78 -24 -7c -00 -08 -00 -86 -18 -78 -44 -7c -00 -37 -d3 -82 -00 +26 20 -00 -00 -64 -78 -4e -fc -00 +40 +54 +e2 78 4d fc @@ -2519,7 +2311,7 @@ c2 00 02 -72 +3e 18 49 7e @@ -2548,22 +2340,10 @@ f2 7e 00 -18 -07 -04 -00 -98 -41 -84 -00 20 -60 -00 -00 20 -60 -00 -00 +7f +55 c6 13 00 @@ -2571,11 +2351,11 @@ 20 40 03 -91 +54 20 40 02 -8a +5d 68 00 c0 @@ -2583,7 +2363,7 @@ c3 00 02 -87 +50 68 00 80 @@ -2604,22 +2384,62 @@ 60 00 00 +78 +34 +7c +00 20 40 -02 -9f -20 -40 -02 -87 +2a +fa +68 +01 +c1 +6f +20 +3a +7f +e9 +68 +00 +c0 +91 +20 +3a +7f +e9 +68 +00 +cd +50 +c0 +00 +ff +e9 +68 +02 +46 +d3 +c3 +82 +00 +00 +20 +40 +05 +2b +20 +40 +02 +50 20 40 3e bf 20 40 -03 -18 +02 +da 68 12 00 @@ -2665,6 +2485,18 @@ 80 7e 68 +10 +80 +7c +79 +3f +fe +05 +60 +10 +80 +7c +68 08 cb 60 @@ -2688,18 +2520,6 @@ 20 68 30 -68 -00 -ca -fe -20 -7a -00 -00 -20 -20 -05 -6d 70 89 5b @@ -2722,8 +2542,8 @@ b9 20 35 -82 -b8 +83 +00 68 01 c4 @@ -2743,55 +2563,23 @@ c2 81 02 -af -20 -40 -05 -9f -c0 -01 -82 -e0 -20 -40 -02 -b9 -68 -00 -c7 -20 -c0 -01 -02 -bc -c0 -7f 82 -bc 20 40 05 -1e -68 -00 -c2 -10 -c0 -19 -82 -bf +60 c0 -1a 02 -c2 -20 -20 -04 -e0 +82 +a8 +70 +11 +c5 +01 20 20 -02 -e2 +07 +6d 68 00 cc @@ -2804,18 +2592,6 @@ 60 00 00 -70 -47 -20 -02 -20 -40 -05 -1e -20 -20 -03 -7e 68 03 41 @@ -2851,7 +2627,7 @@ 24 22 82 -c9 +91 58 00 02 @@ -2867,7 +2643,7 @@ 20 40 02 -d1 +99 58 00 00 @@ -2883,7 +2659,7 @@ 20 40 05 -de +9b 20 20 7d @@ -2915,7 +2691,7 @@ 20 20 02 -d2 +9a 70 4b 66 @@ -2955,19 +2731,23 @@ 20 20 07 -bd +6d 70 -42 -12 -76 -20 +47 +9c +01 20 -3d -36 +40 +58 +14 +70 +4a +fe +01 20 40 -02 -e2 +03 +00 20 40 40 @@ -2979,11 +2759,11 @@ c0 18 02 -ee +b5 c0 18 -83 -00 +82 +cc 20 40 40 @@ -2995,19 +2775,11 @@ 20 20 02 -e6 -70 -4a -fe -01 -20 -20 -02 -e4 +af 20 40 03 -05 +83 68 00 c6 @@ -3015,7 +2787,7 @@ c0 2d 02 -f2 +b9 20 20 40 @@ -3043,11 +2815,31 @@ 20 40 02 -f9 +c5 +68 +00 +c7 +7a +c0 +7f +82 +c2 20 20 -03 -09 +05 +2d +68 +00 +c6 +e1 +60 +00 +c7 +7a +20 +20 +05 +2d ea 61 00 @@ -3075,91 +2867,51 @@ 20 20 02 -f9 +c5 20 40 03 -05 +83 +20 +20 +40 +ea 68 00 -c6 -de -c0 -38 -40 -e8 -70 -46 -e0 -01 +ca +fe 20 -60 +7a 00 00 +70 +4a +fe +00 20 40 02 -e2 +ad 58 00 -80 +00 06 20 40 64 -13 -20 -20 -03 -09 -68 -00 -c7 -7a -c0 -7f -83 -0c -20 -20 -05 -6d -68 -00 -c6 -e1 -60 -00 -c7 -7a -20 -20 -05 -6d -20 -40 -02 -e4 -58 -00 -00 -06 -20 -40 -64 -14 -1f -e1 -fe -08 -1f -ed -7e -00 -1f -e0 -fe -06 +14 +1f +e1 +fe +08 +1f +ed +7e +00 +1f +e0 +fe +06 20 20 64 @@ -3171,7 +2923,7 @@ 20 20 07 -bd +6d 68 08 cb @@ -3192,22 +2944,14 @@ 10 80 81 -79 -3f -fe -00 -79 -3f -fe -01 -79 -20 +1f +e1 7e -03 -79 -3f +ec +1f +e1 fe -04 +08 60 10 80 @@ -3239,7 +2983,7 @@ 20 40 03 -7c +3c 20 40 44 @@ -3259,7 +3003,7 @@ 20 22 83 -65 +23 60 09 47 @@ -3279,27 +3023,27 @@ 20 40 03 -7c +3c 20 40 03 -45 +06 20 40 03 -5c +1d 20 40 03 -51 +12 20 40 03 -48 +09 20 40 -03 -1a +02 +dc d8 40 00 @@ -3323,19 +3067,23 @@ 20 40 03 -51 +12 20 40 03 -48 +09 20 40 03 -74 +34 +70 +42 +12 +76 20 20 -02 -e2 +3d +36 d8 40 00 @@ -3395,7 +3143,7 @@ c2 80 03 -48 +09 20 60 00 @@ -3471,27 +3219,23 @@ 20 40 03 -7c +3c 20 40 03 -5c -20 -20 -65 -62 +1d 20 40 -03 +65 62 20 40 05 -d7 +94 20 40 05 -d0 +8d 68 00 c7 @@ -3499,11 +3243,11 @@ c0 00 83 -70 +30 c0 01 03 -70 +30 70 47 20 @@ -3522,8 +3266,8 @@ 38 20 20 -03 -2f +02 +ef 20 40 43 @@ -3546,8 +3290,8 @@ b9 20 40 -03 -1a +02 +dc 20 40 69 @@ -3579,19 +3323,31 @@ 20 20 03 -75 +35 +70 +47 +20 +02 +20 +40 +04 +e1 20 40 03 -81 +44 20 34 01 -ac +87 +70 +11 +c5 +60 20 20 -01 -aa +07 +6d df 20 00 @@ -3623,7 +3379,7 @@ c2 00 03 -85 +48 20 60 00 @@ -3667,7 +3423,7 @@ 20 40 03 -99 +5c d8 c0 19 @@ -3675,7 +3431,7 @@ 20 40 03 -99 +5c d8 c0 1a @@ -3683,7 +3439,7 @@ 20 40 03 -99 +5c d8 c0 1b @@ -3707,7 +3463,7 @@ 20 40 03 -99 +5c d8 a0 19 @@ -3715,7 +3471,7 @@ 20 40 03 -99 +5c d8 a0 1a @@ -3723,7 +3479,7 @@ 20 40 03 -99 +5c d8 a0 1b @@ -3731,7 +3487,7 @@ 20 20 03 -99 +5c 20 40 58 @@ -3747,7 +3503,7 @@ c0 7f 83 -ab +6e 68 00 c6 @@ -3766,8 +3522,8 @@ 9c 20 5a -04 -01 +02 +aa 68 02 46 @@ -3787,15 +3543,15 @@ 20 40 03 -b8 +7b 20 40 03 -bb +7e 20 40 03 -d7 +9d da 20 46 @@ -3807,7 +3563,7 @@ 20 54 03 -c6 +8c 20 60 00 @@ -3845,9 +3601,21 @@ 46 9b 20 -20 +40 03 -05 +00 +58 +00 +80 +06 +20 +40 +64 +13 +20 +20 +02 +bf 70 47 a0 @@ -3895,7 +3663,7 @@ 20 34 03 -ce +94 20 60 00 @@ -3982,8 +3750,8 @@ 9c 20 5a -04 -01 +02 +aa 68 02 46 @@ -4007,15 +3775,15 @@ 20 40 03 -b8 +7b 20 40 03 -bb +7e 20 40 03 -d7 +9d 68 00 cb @@ -4023,7 +3791,7 @@ c0 00 83 -f0 +b6 68 00 cb @@ -4104,30 +3872,18 @@ 60 00 00 -70 -47 -9c -01 -20 -40 -58 -14 -20 -20 -02 -ec 20 40 7e 34 20 40 -04 -08 +03 +cb 20 40 04 -69 +22 20 20 3e @@ -4135,11 +3891,11 @@ 20 40 05 -9f +60 c0 -02 -84 -0b +03 +03 +ce 20 20 3d @@ -4182,92 +3938,88 @@ 2b 20 40 -05 -2f +04 +ed 20 40 3d 7e 20 20 -03 -32 +02 +f2 1a 62 7e 00 c0 0a -04 -29 +03 +ec c0 0a -84 -2c +83 +ee c0 14 -84 -2f +83 +f0 c0 19 -04 -31 +03 +f2 c0 20 -04 -33 +03 +f4 c0 02 -04 -35 +03 +f6 c0 09 -84 -35 +83 +f6 c0 13 -84 -37 +83 +f8 c0 0c b3 df c0 10 -84 -39 +83 +fa c0 00 -84 -3b +83 +fc c0 01 04 -43 +04 c0 15 84 -46 +06 c0 1c 84 -48 +08 c0 1d 04 -4b +0a c0 1e 04 -4e +0c 20 20 41 7d -20 -40 -02 -ec 70 11 c5 @@ -4275,11 +4027,7 @@ 20 20 07 -bd -20 -40 -04 -55 +6d 70 11 c5 @@ -4287,7 +4035,7 @@ 20 20 07 -bd +6d 70 0a 99 @@ -4303,7 +4051,7 @@ 20 20 07 -bd +6d 70 11 c5 @@ -4311,7 +4059,7 @@ 20 20 07 -bd +6d 70 11 c5 @@ -4319,7 +4067,7 @@ 20 20 07 -bd +6d 20 40 43 @@ -4335,7 +4083,7 @@ 20 20 07 -bd +6d 68 01 42 @@ -4351,15 +4099,15 @@ 20 40 02 -ec +ac 20 40 04 -e3 +9c 20 40 -05 -2a +04 +cf 70 48 09 @@ -4368,10 +4116,6 @@ 20 42 ca -20 -40 -04 -55 70 11 c5 @@ -4379,7 +4123,7 @@ 20 20 07 -bd +6d 70 11 c5 @@ -4387,11 +4131,7 @@ 20 20 07 -bd -20 -40 -02 -ec +6d 70 11 c5 @@ -4399,11 +4139,7 @@ 20 20 07 -bd -20 -40 -04 -55 +6d 70 11 c5 @@ -4411,7 +4147,7 @@ 20 20 07 -bd +6d 70 4b 64 @@ -4419,19 +4155,15 @@ 20 40 04 -e3 +9c 20 40 02 -ec +ac 20 20 3f 8d -20 -40 -04 -55 70 11 c5 @@ -4439,47 +4171,31 @@ 20 20 07 -bd -68 -00 -ca -fe -20 -7a -00 -00 -70 -4a -fe -00 -20 -20 -03 -0f +6d 20 40 -05 -32 +04 +f0 20 40 05 -5e +1c 20 40 04 -e6 +9f 20 40 04 -b6 +6f 20 40 04 -d5 +8e 20 40 04 -bb +74 20 40 42 @@ -4487,27 +4203,27 @@ 20 40 04 -af +68 20 40 04 -9b +54 20 40 04 -98 +51 20 40 04 -a1 +5a 20 40 04 -a7 +60 20 40 04 -90 +49 20 40 42 @@ -4515,7 +4231,7 @@ 20 40 04 -93 +4c 20 20 42 @@ -4539,7 +4255,7 @@ 20 20 84 -82 +3b 68 00 c6 @@ -4563,19 +4279,19 @@ 20 3a 04 -80 +39 20 40 04 -79 +32 70 41 bd 00 20 40 -03 -32 +02 +f2 20 40 43 @@ -4627,7 +4343,7 @@ c2 85 84 -85 +3e 70 4b 24 @@ -4695,7 +4411,7 @@ da 40 04 -96 +4f 20 20 33 @@ -4727,7 +4443,7 @@ da 40 04 -9e +57 20 20 33 @@ -4751,7 +4467,7 @@ da 40 04 -a4 +5d 20 20 33 @@ -4767,7 +4483,7 @@ 20 20 04 -b4 +6d 68 00 cb @@ -4783,7 +4499,7 @@ da 40 04 -ac +65 20 20 33 @@ -4807,7 +4523,7 @@ da 40 04 -b2 +6b 20 20 33 @@ -4835,7 +4551,7 @@ da 40 04 -b9 +72 20 20 33 @@ -4867,7 +4583,7 @@ 20 20 84 -c3 +7c 20 40 43 @@ -4887,7 +4603,7 @@ 20 40 04 -c6 +7f 20 20 43 @@ -4899,7 +4615,7 @@ da 40 04 -c9 +82 20 20 33 @@ -4975,7 +4691,7 @@ 20 3a 04 -de +97 1f e0 ff @@ -5035,19 +4751,19 @@ c0 00 04 -ec +a5 c0 00 84 -f6 +af 20 60 00 00 20 40 -05 -06 +04 +bf 68 00 cb @@ -5071,7 +4787,7 @@ 20 42 84 -f4 +ad 20 60 00 @@ -5082,8 +4798,8 @@ 00 20 20 -05 -13 +04 +d5 68 00 cb @@ -5114,16 +4830,16 @@ 2d 20 3a -05 -02 +04 +bb 68 00 cb 2b 20 3a -05 -11 +04 +d3 1f e0 ff @@ -5138,12 +4854,12 @@ 26 c0 00 -85 -13 +84 +d5 c0 00 -05 -06 +04 +bf 20 60 00 @@ -5158,8 +4874,8 @@ 20 c0 01 -05 -0d +04 +c6 68 08 cb @@ -5192,6 +4908,42 @@ 20 68 25 +68 +08 +cb +25 +79 +20 +04 +07 +20 +40 +68 +0e +68 +08 +cb +25 +20 +20 +68 +29 +68 +00 +cb +2c +24 +7a +00 +00 +68 +00 +cb +2e +24 +7a +00 +00 58 00 00 @@ -5206,8 +4958,8 @@ 2b 24 3a -05 -17 +04 +d9 70 4b 24 @@ -5228,10 +4980,14 @@ 08 cb 25 -20 -40 +79 +3f +84 +07 +20 +40 68 -29 +06 68 08 cb @@ -5292,26 +5048,6 @@ 60 00 00 -68 -00 -cb -2c -24 -7a -00 -00 -68 -00 -cb -2e -24 -7a -00 -00 -20 -20 -05 -11 70 4b 29 @@ -5322,8 +5058,8 @@ 01 20 20 -05 -26 +04 +e9 68 01 4b @@ -5383,7 +5119,7 @@ 24 41 05 -4e +0c 60 01 47 @@ -5395,7 +5131,7 @@ 20 40 05 -51 +0f 68 00 c2 @@ -5407,7 +5143,7 @@ c3 00 05 -49 +07 70 4a fd @@ -5434,8 +5170,8 @@ 00 20 20 -05 -13 +04 +db d8 40 00 @@ -5538,8 +5274,8 @@ cf c0 02 -85 -06 +84 +ca 1f e6 7c @@ -5547,7 +5283,7 @@ 24 21 05 -6b +29 20 60 00 @@ -5558,8 +5294,16 @@ 01 20 20 -05 -13 +04 +d5 +68 +00 +ca +fe +20 +7a +00 +00 68 00 c6 @@ -5567,15 +5311,15 @@ c0 01 05 -8a +4a c0 03 05 -7a +3a c0 03 85 -82 +42 68 00 c7 @@ -5583,7 +5327,7 @@ 20 5a 05 -80 +40 68 00 c7 @@ -5591,7 +5335,7 @@ c0 00 85 -77 +37 c0 01 bd @@ -5619,7 +5363,7 @@ 20 5a 05 -80 +40 68 00 c7 @@ -5627,7 +5371,7 @@ c0 00 85 -88 +48 c0 01 bd @@ -5651,7 +5395,7 @@ 20 5a 05 -80 +40 68 00 c7 @@ -5659,7 +5403,7 @@ c0 00 85 -88 +48 c0 01 bd @@ -5683,7 +5427,7 @@ 20 5a 05 -80 +40 68 00 c7 @@ -5695,7 +5439,7 @@ c0 01 85 -90 +50 20 20 3d @@ -5723,27 +5467,31 @@ 20 40 05 -c4 +81 20 40 40 79 20 40 -40 -7e -20 -40 05 -9d +5e 24 34 05 -9b +5b +20 +40 +07 +8e 20 20 3f a0 +20 +40 +07 +97 70 4b 36 @@ -5755,7 +5503,7 @@ 20 40 05 -9f +60 20 20 40 @@ -5767,15 +5515,7 @@ 20 40 05 -a4 -20 -40 -05 -aa -20 -40 -05 -b0 +63 20 20 40 @@ -5787,7 +5527,7 @@ 20 40 05 -bf +7c 68 08 c6 @@ -5800,10 +5540,6 @@ 20 a2 00 -20 -60 -00 -00 68 08 c6 @@ -5811,7 +5547,7 @@ 20 40 05 -bf +7c 68 08 c6 @@ -5824,10 +5560,6 @@ 20 a2 01 -20 -60 -00 -00 68 08 c6 @@ -5835,7 +5567,7 @@ 20 40 05 -b6 +73 68 08 c6 @@ -5851,7 +5583,7 @@ 20 20 05 -bf +7c 79 3f 84 @@ -5907,7 +5639,7 @@ 20 20 05 -ba +77 68 00 c6 @@ -5927,7 +5659,7 @@ 20 40 04 -e3 +9c 28 0f fe @@ -5935,7 +5667,7 @@ 20 40 81 -ae +89 20 20 42 @@ -5947,7 +5679,7 @@ 20 20 07 -bd +6d 70 11 c5 @@ -5955,11 +5687,11 @@ 20 20 07 -bd +6d 20 40 03 -7c +3c d8 40 00 @@ -5987,7 +5719,7 @@ 20 40 03 -7c +3c d8 40 00 @@ -6039,7 +5771,7 @@ 20 40 03 -05 +83 68 00 c0 @@ -6066,8 +5798,8 @@ d7 20 20 -05 -2a +04 +cf 68 00 c5 @@ -6095,7 +5827,7 @@ 20 40 07 -60 +12 20 20 53 @@ -6130,8 +5862,8 @@ bb 20 40 -00 -6b +01 +fe 20 20 54 @@ -6143,7 +5875,7 @@ 20 20 07 -bd +6d 70 11 c5 @@ -6151,43 +5883,43 @@ 20 20 07 -bd +6d 68 00 84 56 c2 82 -86 -15 +85 +dd 20 40 07 -52 +0e 68 00 c7 8e 24 3a -06 -0b +05 +c8 68 00 84 3f c3 02 -06 -0f +05 +cc 68 00 82 da 20 3a -06 -0f +05 +cc 20 20 56 @@ -6214,8 +5946,8 @@ c4 c0 82 -86 -12 +85 +cf 70 47 8e @@ -6227,19 +5959,11 @@ 20 5a 03 -ca +90 20 20 56 22 -20 -40 -06 -17 -20 -20 -06 -23 68 00 c6 @@ -6281,17 +6005,53 @@ c3 dc 20 -40 +20 56 50 20 -60 +40 +05 +d2 +68 +00 +cd +49 +1f +e6 +7c +02 +24 +41 +05 +e6 +68 +00 +cd +49 +c1 +00 00 00 +1f +e0 +ff +ff +60 +00 +cd +49 20 +60 +00 +00 +70 +4d +49 +03 20 -07 -56 +60 +00 +00 68 00 c7 @@ -6374,8 +6134,8 @@ 0c c0 01 -86 -3a +85 +fe 20 20 56 @@ -6387,7 +6147,7 @@ c0 00 86 -3d +01 20 20 5c @@ -6419,11 +6179,11 @@ c0 02 06 -46 +0a c0 03 06 -73 +36 20 20 56 @@ -6434,8 +6194,8 @@ a5 20 40 -06 -24 +05 +e8 20 40 7e @@ -6451,7 +6211,7 @@ c0 08 06 -55 +19 1f ec 84 @@ -6463,7 +6223,7 @@ 20 21 06 -63 +27 d8 40 47 @@ -6547,7 +6307,7 @@ c0 05 06 -65 +29 20 20 58 @@ -6563,7 +6323,7 @@ c2 81 86 -6c +30 68 01 04 @@ -6591,7 +6351,7 @@ 24 22 86 -68 +2c 20 40 5a @@ -6599,15 +6359,11 @@ 24 34 06 -68 -70 -04 -7a -05 +2c 20 20 -5a -77 +59 +e2 e8 c0 80 @@ -6615,11 +6371,7 @@ c0 00 86 -77 -c0 -02 -86 -79 +39 20 20 5a @@ -6632,14 +6384,6 @@ 20 5b 09 -70 -11 -c5 -82 -20 -20 -07 -bd 68 00 80 @@ -6648,22 +6392,6 @@ 93 d6 f2 -20 -40 -06 -81 -d8 -e0 -00 -00 -68 -01 -44 -82 -20 -20 -7f -08 18 0a 7e @@ -6681,9 +6409,13 @@ fe fa 20 -20 +40 3c be +20 +20 +57 +10 78 55 fc @@ -6691,7 +6423,7 @@ 20 37 06 -89 +46 24 36 d8 @@ -6787,7 +6519,7 @@ 20 40 06 -a3 +60 60 18 80 @@ -6804,18 +6536,14 @@ 10 80 81 -79 -20 -7e -00 -79 -3f +1f +e1 fe 01 -79 -3f -fe -03 +1f +e1 +7e +f5 60 10 80 @@ -6831,7 +6559,7 @@ 20 20 07 -bd +6d 20 40 21 @@ -6867,7 +6595,7 @@ c5 05 86 -b8 +74 20 40 24 @@ -6875,11 +6603,11 @@ 24 3a 06 -b1 +6d c5 16 86 -c1 +7d 20 20 21 @@ -6919,7 +6647,7 @@ 20 20 06 -b1 +6d 68 02 01 @@ -6983,7 +6711,7 @@ 20 40 86 -d2 +8e 20 20 24 @@ -6998,16 +6726,16 @@ 03 20 40 -87 -56 +85 +de 24 40 87 -52 +0e 20 20 07 -60 +12 20 40 24 @@ -7022,8 +6750,8 @@ bb 20 40 -00 -6b +01 +fe 20 20 25 @@ -7059,7 +6787,7 @@ 20 3a 06 -e6 +a2 68 00 c5 @@ -7166,8 +6894,8 @@ de 20 5a -07 -00 +06 +bc 20 20 2b @@ -7191,7 +6919,7 @@ 20 20 07 -bd +6d 70 11 c5 @@ -7199,7 +6927,7 @@ 20 20 07 -bd +6d 68 00 85 @@ -7210,8 +6938,8 @@ c9 c0 09 -87 -0b +86 +c7 20 20 5d @@ -7247,7 +6975,7 @@ 20 20 07 -bd +6d 20 40 62 @@ -7266,12 +6994,12 @@ 00 c0 02 -07 -35 +06 +f1 c0 08 -07 -1a +06 +d6 20 20 63 @@ -7286,8 +7014,8 @@ 00 c0 00 -87 -1e +86 +da 20 20 63 @@ -7302,8 +7030,8 @@ 6d c2 80 -07 -22 +06 +de 20 20 63 @@ -7370,8 +7098,8 @@ 00 24 21 -07 -33 +06 +ef 20 20 63 @@ -7410,16 +7138,16 @@ d6 c0 0f -87 -3f +86 +fb c0 10 -07 -42 +06 +fe c0 09 07 -4c +08 20 20 7d @@ -7435,7 +7163,7 @@ 20 20 07 -44 +00 70 01 85 @@ -7474,8 +7202,8 @@ fb 20 20 -03 -32 +02 +f2 20 40 58 @@ -7517,46 +7245,6 @@ 00 00 68 -00 -cd -49 -1f -e6 -7c -02 -24 -41 -07 -5e -68 -00 -cd -49 -c1 -00 -00 -00 -1f -e0 -ff -ff -60 -00 -cd -49 -20 -60 -00 -00 -70 -4d -49 -03 -20 -60 -00 -00 -68 01 46 82 @@ -7579,7 +7267,7 @@ 20 40 02 -6f +3b 60 08 cd @@ -7591,7 +7279,7 @@ c5 13 07 -6a +1c 58 00 00 @@ -7603,7 +7291,7 @@ 24 21 07 -82 +34 68 00 cd @@ -7615,7 +7303,7 @@ 24 21 07 -72 +24 68 00 cd @@ -7623,7 +7311,7 @@ c0 00 07 -83 +35 20 60 00 @@ -7651,7 +7339,7 @@ c5 13 07 -79 +2b 58 00 00 @@ -7671,7 +7359,7 @@ c0 00 07 -8a +3c 1f e0 ff @@ -7683,7 +7371,7 @@ c0 00 07 -8a +3c 70 41 de @@ -7703,7 +7391,7 @@ c0 01 07 -88 +3a 1f e0 fe @@ -7715,7 +7403,7 @@ c0 00 87 -80 +32 70 41 de @@ -7799,19 +7487,19 @@ c0 01 07 -a4 +56 c0 02 07 -a9 +5e c0 10 07 -b8 +68 20 40 07 -ae +63 70 89 55 @@ -7828,10 +7516,22 @@ 20 29 4b -20 -40 -07 -b3 +70 +89 +4c +fb +70 +89 +4d +ef +70 +89 +4e +ec +70 +89 +4f +5e 70 89 55 @@ -7851,7 +7551,7 @@ 20 40 07 -ae +63 70 89 55 @@ -7890,178 +7590,558 @@ 00 70 89 -4c -fb -70 -89 -4d -ef -70 -89 -4e -ec +56 +c2 70 89 -4f -5e +55 +d0 20 60 00 00 +18 +00 +2a +08 +20 +20 +28 +fa +68 +08 +91 +c5 +18 +51 +84 +00 +68 +00 +cb +4f +98 +46 +7c +00 +20 +22 +87 +8c +60 +08 +cb +4f +18 +40 +84 +01 +58 +00 +01 +00 +98 +4f +84 +00 +68 +01 +cb +50 +98 +46 +7e +00 +68 +09 +cb +53 +98 +40 +fe +00 +1f +e0 +ff +fb +60 +01 +cb +56 +20 +40 +03 +3c +68 +01 +cb +56 +d8 +40 +01 +00 +da +20 +1f +00 +20 +40 +65 +62 +68 +02 +1f +00 +68 +0a +4b +59 +98 +46 +7c +00 +24 +22 +87 +7d +20 +40 +03 +00 +58 +00 +1f +00 +60 +01 +41 +99 +70 +41 +9b +40 +20 +40 +64 +ca +58 +00 +00 +00 +60 +02 +41 +99 +68 +00 +91 +c5 +20 +20 +00 +01 +68 +02 +46 +9b +20 +7a +00 +00 +20 +40 +07 +e1 +58 +00 +00 +06 +20 +40 +07 +d4 +58 +00 +00 +03 +20 +40 +07 +da +68 +00 +cb +0b +c0 +00 +87 +9a +df +20 +00 +05 +d8 +a0 +4b +0b +20 +20 +7e +d4 +68 +01 +4b +0c +60 +01 +11 +be +68 +01 +46 +9b +60 +01 +11 +c0 +20 +40 +07 +ad +68 +01 +11 +be +60 +01 +4b +0c +68 +01 +11 +c0 +60 +01 +46 +9b +68 +01 +4b +0e +60 +01 +11 +be +68 +01 +46 +9d +60 +01 +11 +c0 +20 +40 +07 +ad +68 +01 +11 +be +60 +01 +4b +0e +68 +01 +11 +c0 +60 +01 +46 +9d +20 +60 +00 +00 +68 +01 +11 +be +68 +09 +11 +c0 +98 +40 +fe +00 +60 +01 +91 +c2 +2f +ef +fe +10 +20 +20 +87 +ba +68 +00 +91 +c3 +c0 +7f +87 +c1 +68 +00 +91 +c2 +1f +e3 +7e +00 +60 +01 +11 +be +60 +01 +11 +c0 +20 +60 +00 +00 +68 +00 +91 +c3 +c0 +00 +07 +be +68 +01 +91 +c2 +20 +20 +07 +b6 +70 +11 +c4 +00 +68 +00 +91 +c2 +20 +20 +07 +b6 +68 +00 +91 +c2 +20 +40 +07 +cc +60 +00 +91 +be +60 +00 +91 +c0 +20 +3a +07 +ca +58 +00 +00 +ff +60 +00 +91 +bf +60 +00 +91 +c1 +20 +60 +00 +00 +58 +00 +00 +00 +20 +20 +07 +c7 +1f +e6 +7e +00 +60 +00 +8a +ae +68 +00 +8a +ae +1f +e3 +7e +00 +60 +00 +8a +ae +68 +00 +8a +ae +1f +e6 +7e +00 +20 +60 +00 +00 +9a +26 +7c +00 +24 +21 +07 +df +9a +46 +7c +00 +24 +21 +07 +df 70 -89 -56 -c2 -70 -89 -55 -d0 +4b +0b +00 20 60 00 00 -18 +9a +26 +7c 00 -2a -08 -20 -20 -28 -fa -68 -08 -91 -c5 -18 -51 -84 +24 +61 00 -68 00 -cb -4f -98 +9a 46 7c 00 -20 -22 -87 -dc -60 -08 -cb -4f -18 -40 -84 -01 -58 +24 +61 +00 00 +20 +20 +07 +d8 +70 +4b +0b 01 +20 +60 00 -98 -4f -84 00 68 01 -cb -50 -98 46 -7e -00 -68 -09 -cb -53 -98 -40 -fe -00 -1f -e0 -ff -fb +9b 60 01 -cb -56 +11 +c0 20 40 -03 -7c +07 +ea +1f +e2 +22 +00 68 01 -cb -56 -d8 -40 +46 +9d +60 01 -00 -da +11 +c0 20 +40 +07 +ea 1f +e2 +24 00 20 -40 -65 -62 -68 -02 -1f +60 +00 00 68 -0a -4b -59 -98 -46 -7c 00 -24 -22 +91 +c1 +c0 +7f 87 -cd -20 -40 -02 -e2 -58 +ef +68 00 +91 +c0 1f -00 -60 -01 -41 -99 -70 -41 -9b -40 +e1 +7e +ff 20 -40 -64 -ca -58 -00 +60 00 00 -60 -02 -41 -99 68 +01 +11 +c0 +1f +e6 +7e 00 -91 -c5 20 20 -00 -01 -12 -fc +07 +ed +56 +cd aa 55 03 @@ -8659,9 +8739,9 @@ 47 72 01 -08 +18 01 -0e +2c 01 aa 55 @@ -8851,7 +8931,7 @@ 00 55 4c -04 +06 aa 55 01 @@ -9103,15 +9183,9 @@ 00 50 4b -a0 +ea 2f 00 -55 -aa -aa -55 -a2 -0a ff 20 20 @@ -9124,23 +9198,27 @@ c0 58 80 -11 +12 c0 59 00 -17 +18 c0 59 80 -1c +1d c0 5a 00 -23 +24 20 60 00 00 +20 +40 +02 +ac 68 01 42 @@ -9164,7 +9242,7 @@ 24 3a 00 -0e +0f 70 4b 6a @@ -9172,11 +9250,11 @@ 20 40 04 -e3 +9c 20 40 03 -c1 +87 20 20 41 @@ -9232,15 +9310,15 @@ c0 00 80 -1f +20 20 20 00 -21 +22 20 40 -04 -2f +03 +f0 70 46 c6 @@ -9253,6 +9331,10 @@ 20 41 b9 +20 +40 +02 +ce 70 4a ff @@ -9361,14 +9443,6 @@ 00 00 00 -00 -00 -00 -00 -00 -00 -00 -00 20 20 00 @@ -9380,23 +9454,27 @@ c0 50 80 -0d +0e c0 51 00 -20 +21 c0 51 80 -19 +1a c0 52 00 -29 +2b 20 60 00 00 +20 +40 +02 +ce 70 4d 50 @@ -9404,11 +9482,11 @@ 20 40 02 -b9 +84 20 40 01 -ae +89 70 41 bd @@ -9416,11 +9494,11 @@ 20 40 02 -8c +5f 20 20 04 -e0 +99 68 01 45 @@ -9459,8 +9537,8 @@ 98 20 40 -04 -2f +03 +f0 70 47 c4 @@ -9497,6 +9575,10 @@ 20 33 a7 +20 +40 +02 +ce 70 4b 65 @@ -9524,7 +9606,7 @@ 20 40 03 -c1 +87 20 40 58 @@ -9533,6 +9615,10 @@ 20 41 d9 +20 +40 +02 +ce 78 34 7c @@ -9564,11 +9650,11 @@ 20 40 02 -8c +5f 20 40 03 -74 +34 68 10 80 @@ -9613,18 +9699,6 @@ 00 00 00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 20 20 00 @@ -9640,7 +9714,7 @@ c0 49 00 -2f +30 20 60 00 @@ -9740,15 +9814,19 @@ 20 40 01 -b2 +8d 20 40 01 -37 +17 20 20 7f e7 +20 +40 +07 +0b 68 00 cc @@ -9760,15 +9838,15 @@ c0 08 80 -25 +26 c0 09 00 -27 +28 c0 09 80 -29 +2a 20 60 00 @@ -9780,7 +9858,7 @@ 20 20 01 -6f +4f 70 4c 20 @@ -9788,7 +9866,7 @@ 20 20 01 -6f +4f 70 4c 20 @@ -9808,11 +9886,15 @@ 20 40 01 -c4 +9e 20 20 01 -6f +4f +20 +40 +02 +ac 70 47 8b @@ -9844,11 +9926,11 @@ 20 40 04 -e3 +9c 20 40 02 -b9 +84 68 02 4c @@ -9863,16 +9945,8 @@ 66 20 20 -03 -32 -00 -00 -00 -00 -00 -00 -00 -00 +02 +f2 00 00 00 @@ -9913,10 +9987,14 @@ 60 00 00 -20 +68 +02 40 -00 -f5 +a0 +60 +02 +4c +47 20 40 3e @@ -9936,7 +10014,7 @@ 20 40 00 -23 +24 58 00 00 @@ -9972,15 +10050,15 @@ 20 40 05 -cc +89 20 40 03 -7c +3c 20 40 03 -41 +02 68 01 c7 @@ -9995,8 +10073,8 @@ 62 20 40 -03 -28 +02 +e8 df 20 00 @@ -10008,15 +10086,15 @@ 20 40 03 -83 +46 24 34 02 -d8 +a0 20 40 02 -da +a2 20 60 00 @@ -10133,10 +10211,6 @@ 00 00 00 -00 -00 -00 -00 20 20 00 @@ -10180,7 +10254,7 @@ 20 40 01 -76 +56 24 2c 00 @@ -10192,11 +10266,11 @@ 20 40 01 -9e +7c 20 40 02 -b9 +84 68 02 4c @@ -10232,11 +10306,11 @@ 20 40 01 -73 +53 20 20 03 -8d +50 70 11 9e @@ -10268,11 +10342,11 @@ 20 40 01 -b2 +8d 20 20 01 -d2 +ac 68 00 cc @@ -10332,11 +10406,11 @@ 20 40 01 -c5 +9f 20 20 01 -e4 +be 20 40 00 @@ -10388,7 +10462,7 @@ 20 20 01 -c4 +9e 00 00 00 @@ -10416,11 +10490,11 @@ 20 40 01 -c5 +9f 20 40 01 -e4 +be 68 00 cc @@ -10456,7 +10530,7 @@ 20 40 01 -76 +56 24 2c 00 @@ -10484,11 +10558,11 @@ 20 40 01 -73 +53 20 20 03 -8d +50 70 11 9e @@ -10520,11 +10594,11 @@ 20 40 01 -b2 +8d 20 20 01 -d2 +ac 68 01 4c @@ -10540,7 +10614,7 @@ 20 40 01 -e4 +be 20 20 00 @@ -10636,7 +10710,7 @@ 20 20 01 -c4 +9e 00 00 00 @@ -10668,7 +10742,7 @@ 20 40 02 -b9 +84 70 47 20 @@ -10696,7 +10770,7 @@ 20 40 05 -d0 +8d 68 09 47 @@ -10715,8 +10789,8 @@ a1 20 40 -03 -37 +02 +f7 18 0a 7e @@ -10736,7 +10810,7 @@ 20 40 02 -d8 +a0 20 40 34 @@ -10803,8 +10877,8 @@ dd 20 20 -05 -23 +04 +e6 70 47 9f @@ -10812,7 +10886,7 @@ 20 40 02 -d1 +99 58 00 00 @@ -10828,7 +10902,7 @@ 20 40 05 -de +9b 20 20 7d @@ -11740,7 +11814,7 @@ c2 85 04 -6e +27 20 20 41 @@ -11772,7 +11846,7 @@ c2 85 04 -6e +27 20 40 33 @@ -11780,11 +11854,11 @@ 20 40 05 -9f +60 c0 02 84 -e0 +99 20 20 33 @@ -11936,7 +12010,11 @@ c0 00 00 -03 +04 +c0 +00 +80 +11 20 60 00 @@ -11968,7 +12046,7 @@ 20 2c 00 -0e +0f 79 3f 80 @@ -11980,7 +12058,7 @@ 24 3a 00 -07 +08 20 20 20 @@ -11993,46 +12071,42 @@ 20 21 5f +20 +40 +02 +84 +68 00 +c7 +20 +c0 +01 +03 +3e +c0 +7f +83 +3e +20 +40 +04 +e1 +68 00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 -00 +c2 +10 +c0 +19 +82 +87 +c0 +1a +02 +8a +20 +20 +04 +99 00 00 00 @@ -12189,5 +12263,5 @@ 55 00 00 -34 -8c +b1 +d1 Index: output/romcode.rom =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/output/romcode.rom (revision 5062) +++ /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/output/romcode.rom (working copy) @@ -24572,7 +24572,8 @@ e0a08000 c2007ff9 20600000 -c0000003 +c0000004 +c0008011 20600000 6800800e 1fe0fe01 @@ -24580,13 +24581,22 @@ 20402435 7920002c 204022f2 -202c000e +202c000f 793f802c 20402455 -243a0007 +243a0008 202020fc 793f802c 2020215f +20400284 +6800c720 +c001033e +c07f833e +204004e1 +6800c210 +c0198287 +c01a028a +20200499 c0080004 c008801d 20600000 @@ -24602,7 +24612,7 @@ 202042b0 204041c1 68014208 -c285046e +c2850427 202041f7 c2828015 c2818015 @@ -24610,10 +24620,10 @@ 68014682 c28642b0 68014208 -c285046e +c2850427 204033a9 -2040059f -c00284e0 +20400560 +c0028499 202033a7 68010264 1fe20c00 @@ -24750,24 +24760,24 @@ c0280003 20600000 704b6b00 -204002b9 +20400284 70472001 70479c00 68014682 c2858013 680246d3 c30c0013 -204005d0 +2040058d 680947c2 18408401 600947c2 600944a1 -20400337 +204002f7 180a7e00 6000c4a0 6801cb67 6001c4a3 -204002d8 +204002a0 20403418 68014687 600146ac @@ -24784,20 +24794,20 @@ 6800c092 2feffe00 2040fddd -20200523 +202004e6 70479f00 -204002d1 +20400299 58000005 e0c08000 d8c04b10 -204005de +2040059b 20207df4 c0300004 c0308026 20600000 793f8026 -204001c5 -204001e4 +2040019f +204001be 6800cc20 c1ff8000 20400018 @@ -24806,15 +24816,15 @@ 200007d0 6800cc3d c07fadd4 -20400176 +20400156 242c0021 24378021 79200026 58000000 60014c3d 20402f20 -20400173 -2020038d +20400153 +20200350 70119eff 6800cc11 6000919f @@ -24822,12 +24832,12 @@ 600211a0 d8400006 da20119e -204001b2 -202001d2 +2040018d +202001ac 68014c3d 1fe0fe01 60014c3d -204001e4 +204001be 2020000c 6800c720 c1008000 @@ -24851,7 +24861,7 @@ 704c0f00 704c1a4e 68024c1c -202001c4 +2020019e c0380003 20600000 793f8026 @@ -24861,11 +24871,11 @@ 200007d0 6800cc3d c07fadd4 -20400176 +20400156 242c0022 24378022 -2040019e -204002b9 +2040017c +20400284 68024c38 680a4c1c 98467c00 @@ -24874,8 +24884,8 @@ 58000000 60014c3d 20402f20 -20400173 -2020038d +20400153 +20200350 70119eff 6800cc11 6000919f @@ -24883,8 +24893,8 @@ 600211a0 d8400006 da20119e -204001b2 -202001d2 +2040018d +202001ac 6800cc3d 1fe0fe01 6000cc3d @@ -24899,8 +24909,8 @@ 58000f0f 60014c38 e0a10000 -204001c5 -202001e4 +2040019f +202001be 2040002c 20200007 2040003a @@ -24913,7 +24923,7 @@ 704c0f00 704c1a4e 68024c1c -202001c4 +2020019e c0400008 c0408004 20600000 @@ -24921,12 +24931,13 @@ 58001122 600147c2 20600000 -204000f5 +680240a0 +60024c47 20403e6e 6808cb44 2040680e 20403e1e -20400023 +20400024 58000000 60014154 204068a2 @@ -24935,18 +24946,18 @@ 20405839 2040582c 20405818 -204005cc -2040037c -20400341 +20400589 +2040033c +20400302 6801c700 9a40fe00 20406562 -20400328 +204002e8 df200003 d8c04722 -20400383 -243402d8 -204002da +20400346 +243402a0 +204002a2 20600000 204074b9 d8c08c00 @@ -24977,7 +24988,7 @@ 20600000 c0480005 c048801f -c049002f +c0490030 20600000 6800cc15 c000ffe7 @@ -25002,25 +25013,27 @@ 7011a400 da20119e d8400007 -204001b2 -20400137 +2040018d +20400117 20207fe7 +2040070b 6800cc20 c17f8000 -c0088025 -c0090027 -c0098029 +c0088026 +c0090028 +c009802a 20600000 704c2002 -2020016f +2020014f 704c2003 -2020016f +2020014f 704c20ff 700a9939 20407d86 68024bf0 -204001c4 -2020016f +2040019e +2020014f +204002ac 70478b01 d8e00003 204043d2 @@ -25028,24 +25041,25 @@ 60014707 7046a700 2040405d -204004e3 -204002b9 +2040049c +20400284 68024c38 6002477b 20404366 -20200332 +202002f2 c0500007 -c050800d -c0510020 -c0518019 -c0520029 +c050800e +c0510021 +c051801a +c052002b 20600000 +204002ce 704d5000 -204002b9 -204001ae +20400284 +20400189 7041bd00 -2040028c -202004e0 +2040025f +20200499 68014509 c1000000 68008441 @@ -25055,7 +25069,7 @@ 58000009 60014496 60014498 -2040042f +204003f0 7047c401 20600000 68014682 @@ -25065,15 +25079,17 @@ 680246d3 c3828000 202033a7 +204002ce 704b6500 58000007 60014496 60014498 7047c400 70479c00 -204003c1 +20400387 20405816 202041d9 +204002ce 78347c00 68120138 79347e1a @@ -25081,27 +25097,28 @@ 20402c21 204074bd 20403e9f -2040028c -20400374 +2040025f +20400334 68108081 1fe17ef7 60108081 20600000 c0580007 -c0588011 -c0590017 -c059801c -c05a0023 +c0588012 +c0590018 +c059801d +c05a0024 20600000 +204002ac 6801420a 793ffe0a 6001420a 704b6501 6800c79f -243a000e +243a000f 704b6a14 -204004e3 -204003c1 +2040049c +20400387 202041c3 6800c808 c1010000 @@ -25115,14 +25132,15 @@ 7041e30e 2020340e 6800c79f -c000801f -20200021 -2040042f +c0008020 +20200022 +204003f0 7046c605 d8e00001 202041b9 +204002ce 704aff00 704b0100 704b0a00 202041d9 -0000c84f +0000852e Index: program/24g.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/24g.prog (revision 5062) +++ /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/24g.prog (working copy) @@ -368,6 +368,7 @@ copy temp,loopcnt add regc,offset_24g_txbuf,contw //arg mem_24g_txbuf,contw +g24_put_data_in_buff2: copy rega,contr branch memcpy @@ -461,6 +462,7 @@ call callback_func add regc,offset_24g_enter_hibernate,temp ifetch 8,temp +g24_lpm_long_sleep_next: call clk2lpo storet 4,mem_sleep_counter branch lpm_sleep Index: program/le.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/le.prog (revision 5062) +++ /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/le.prog (working copy) @@ -234,6 +234,7 @@ fetch 3,mem_le_crcinit iforce crc24_init fetch 1,mem_le_ch_mapped +le_prep2: reverse pdata,temp set1 1,temp rshift temp,white_init @@ -533,6 +534,7 @@ istore 3,contw branch end_of_packet,crc_failed enable match +lerx_nopayload2: fetch 1,mem_last_freq add pdata,0,rega // ble 2M Medium Frequency call rf_write_freq /* set frequency to tx mode freq */ @@ -1265,6 +1267,7 @@ fetcht 1,mem_le_adv_channel_map isub temp,null nbranch le_adv_loop,zero +le_adv_not_match2: arg le_adv_interval_timer,queue fetch 2,mem_le_adv_interval branch timer_init Index: program/le_l2cap_att.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/le_l2cap_att.prog (revision 5062) +++ /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/le_l2cap_att.prog (working copy) @@ -401,6 +401,7 @@ //le_send_att_read_response_error_insufficient_auth: call le_check_encrypt_state nbranch le_send_att_read_response,user +le_send_att_read_response_check_auth_next: jam ATT_ERR_INSUFFICIENT_AUTHENTICATION,mem_le_err_code branch le_send_att_error_response Index: program/patch.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/patch.prog (revision 5062) +++ /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/patch.prog (working copy) @@ -3,7 +3,7 @@ define G24 define BLE define CLASSIC_BT -//define MOUSE_SMOOTHER +define MOUSE_SMOOTHER define ADC_ENABLE //define P24G_LOG //define RF_DEBUG @@ -175,18 +175,6 @@ ifdef MOUSE -p_rssi_signal: - copy pdata,rega - fetcht 1,mem_rssi_signal_index - setarg mem_rssi_signal_buf - iadd temp,contw - copy rega,pdata - istore 1,contw - increase 1,temp - and_into RSSI_BUF_LEN_SIGNAL,temp - storet 1,mem_rssi_signal_index - rtn - //p_mouse_select_device_button_wakeup_check: // jam 0,mem_mouse_select_device_button_wakeup_flag // fetcht 1,mem_config_select_device_button_gpio @@ -286,7 +274,10 @@ fetch 1,mem_24g_pairing_sm rtnne STATE_24G_PAIRING_SUCCESS call power_ctrl_start - call g24_long_sleep_shorter_param_update + //call g24_long_sleep_shorter_param_update + setarg G24_LONG_SLEEP_STEP1 + store 3,mem_24g_enter_hibernate + jam 20,mem_24g_long_sleep_param_update_timer fetch 1,mem_mouse_multi_led_state beq ON,p_g24_transmit_by_interrupt_enable p_g24_short_sleep: @@ -296,13 +287,13 @@ setarg 60500 branch lpm_dispatch_sleep -g24_long_sleep_shorter_param_update: +//g24_long_sleep_shorter_param_update: // fetch 1,mem_config_function_enable // rtnbit1 ENABLE_SENSOR_MOTION_PIN - setarg G24_LONG_SLEEP_STEP1 - store 3,mem_24g_enter_hibernate - jam 20,mem_24g_long_sleep_param_update_timer - rtn +// setarg G24_LONG_SLEEP_STEP1 +// store 3,mem_24g_enter_hibernate +// jam 20,mem_24g_long_sleep_param_update_timer +// rtn p_g24_transmit_by_interrupt: call p_g24_timer_check @@ -315,6 +306,7 @@ isub temp,null call p_g24_transmit_by_interrupt_exit,zero branch p_g24_transmit_process + p_g24_transmit_by_interrupt_exit: jam G24_TX_TIMER_INT_DISABLE,mem_24g_transmit_by_interrupt setarg 0 @@ -349,22 +341,7 @@ call p_g24_lpm_wait nrtn user fetch 3,mem_24g_enter_hibernate - call clk2lpo - storet 4,mem_sleep_counter - branch lpm_sleep - -p_g24_lpm_wait: - enable user - call lpo_calibration - fetch 3,mem_clks_per_lpo - branch disable_user,blank - fetch 1,mem_lpm_mode - branch disable_user,blank - fetch 1,mem_24g_transmit_by_interrupt - beq G24_TX_TIMER_INT_ENABLE,disable_user - fetch MOUSE_FLAG_LEN,mem_mouse_flag - rtnbit1 MOUSE_LOW_VOLTAGE_FLAG - branch p_mouse_setgpio_lpm + branch g24_lpm_long_sleep_next p_g24_send_abort_packet: jam 1,mem_24g_abort_pac @@ -382,11 +359,6 @@ call p_g24_txdata_enable_tx branch p_g24_transmit_start -p_g24_set_device_addr: - fetch 4,mem_lap - store 4,mem_24g_device_addr - rtn - p_g24_transmit_rf_sta_init: jam 1,mem_24g_rf_last_sta jam 0,mem_24g_sync_cnt @@ -396,13 +368,13 @@ store 1,mem_24g_data_type rtn -p_g24_hop_ch_enable: - fetch 1,mem_24g_data_type - set1 bit_hop,pdata - store 1,mem_24g_data_type - //update txpayload - store 1,mem_24g_txpayload - rtn +//p_g24_hop_ch_enable: +// fetch 1,mem_24g_data_type +// set1 bit_hop,pdata +// store 1,mem_24g_data_type +// //update txpayload +// store 1,mem_24g_txpayload +// rtn p_g24_hop_enable_packet: fetch 1,mem_24g_data_type @@ -611,9 +583,9 @@ nbranch p_g24_tx_fast_hop,positive // >= 6+6 hop fast fail packet count >= 2 increase 1,pdata store 1,mem_24g_retry - beq 2,p_g24_hop_ch_enable + //beq 2,p_g24_hop_ch_enable beq 6,p_g24_hop_ch_disable - beq 8,p_g24_hop_ch_enable + //beq 8,p_g24_hop_ch_enable beq 12,p_g24_hop_ch_disable rtn @@ -631,15 +603,10 @@ branch p_zcode_entrance p_g24_paring_mode_start: - call power_ctrl_pac_succ_cnt_init p_g24_paring_mode: jam ZCODE_91,mem_zcode_temp_param0 branch p_zcode_entrance -p_g24_start_24g_mode: - jam ZCODE_60,mem_zcode_temp_param0 - branch p_zcode_entrance - p_g24_auto_pair_start: jam ZCODE_70,mem_zcode_temp_param0 branch p_zcode_entrance @@ -651,13 +618,11 @@ arg MOSUE_24G_PAIRING_FLAG,queue branch mouse_disable_function_flag - p_g24_put_data_in_buff: storet 1,mem_24g_datalen copy temp,loopcnt arg mem_24g_txbuf,contw - copy rega,contr - branch memcpy + branch g24_put_data_in_buff2 p_g24_read_len_pid_crc: //read control @@ -728,17 +693,8 @@ p_g24_ch: fetcht 1,mem_24g_current_ch_number - call p_g24_ch_map_size - storet 1,mem_24g_current_ch_number - rtn - -p_g24_ch_map_size: - call p_g24_ch_calc - increase 1,temp - and_into 3,temp //map size =4 - rtn - -p_g24_ch_calc: + //call p_g24_ch_map_size + //call p_g24_ch_calc fetch 1,mem_24g_addr and_into 0x03,pdata mul32 pdata,4,rega //24addr low bit0 bit1 ,00-map1,01-map2,10-map3,11-map4 @@ -747,18 +703,26 @@ iadd temp,contr ifetch 1,contr store 1,mem_24g_ch + increase 1,temp + and_into 3,temp //map size =4 + storet 1,mem_24g_current_ch_number rtn + +//p_g24_ch_calc: +// fetch 1,mem_24g_addr +// and_into 0x03,pdata +// mul32 pdata,4,rega //24addr low bit0 bit1 ,00-map1,01-map2,10-map3,11-map4 +// setarg mem_24g_ch_map1 +// iadd rega,pdata +// iadd temp,contr +// ifetch 1,contr +// store 1,mem_24g_ch +// rtn p_g24_prep: - disable enable_crc - disable enable_white - setarg 0x555555 - iforce crc24_init + call g24_prep fetch 1,mem_24g_ch - reverse pdata,temp - set1 1,temp - rshift temp,white_init - rtn + branch le_prep2 //p_g24_receive_packet: // call le_enable @@ -785,7 +749,7 @@ fetch 2,mem_24g_rx_window iforce stop_watch correlate null,timeout - nbranch p_g24_sync_timeout,sync + nbranch p_g24_end_of_packet,sync ifdef RF_DEBUG call test_gpio_low @@ -846,20 +810,26 @@ endif enable user3 - fetch 1,mem_last_freq - add pdata,0,rega - call rf_write_freq - disable decode_fec0 - call set_sync_on + call lerx_nopayload2 ifdef DONGLE rtn endif -ifdef MOUSE + fetch 1,mem_rssi_hex_received - call p_rssi_signal -endif + //branch p_rssi_signal +p_rssi_signal: + copy pdata,rega + fetcht 1,mem_rssi_signal_index + setarg mem_rssi_signal_buf + iadd temp,contw + copy rega,pdata + istore 1,contw + increase 1,temp + and_into RSSI_BUF_LEN_SIGNAL,temp + storet 1,mem_rssi_signal_index rtn + p_g24_receive_byte: parse demod,bucket,8 rshift3 pwindow,pdata @@ -868,29 +838,32 @@ p_g24_end_of_packet: disable encode_fec1 disable decode_fec1 - call end_of_packet -ifdef RF_DEBUG - call test_gpio_low -endif - rtn + branch end_of_packet +//ifdef RF_DEBUG +// call test_gpio_low +//endif +// rtn -p_g24_sync_timeout: -ifdef DONGLE +//p_g24_sync_timeout: +//ifdef DONGLE // call p_rssi_noise -endif - branch p_g24_end_of_packet +//endif +// branch p_g24_end_of_packet -p_g24_set_freq_tx: - call set_sync_on - fetcht 1,mem_24g_ch - branch set_freq_tx +//p_g24_set_freq_tx: +// call set_sync_on +// fetcht 1,mem_24g_ch +// branch set_freq_tx p_g24_transmit: call le_enable fetch 4,mem_24g_addr iforce access call p_g24_prep - call p_g24_set_freq_tx + //call p_g24_set_freq_tx + call set_sync_on + fetcht 1,mem_24g_ch + call set_freq_tx set1 TXGFSK,radio_ctrl enable encode_fec0 enable is_tx @@ -930,13 +903,7 @@ fetch 1,mem_24g_paccnt inject mod,8 endif - - enable enable_parity - inject mod,24 //crc - disable enable_parity - until null,tx_clear - nop 100 - disable encode_fec0 + call letr_nopayload disable encode_fec1 rtn @@ -991,7 +958,7 @@ ifdef DONGLE branch rssi_average_loop endif -ifdef MOUSE +//ifdef MOUSE p_rssi_average_loop: ifetch 1,contr iadd temp,temp @@ -1004,11 +971,9 @@ call wait_div_end quotient pdata lshift4 pdata,pdata - remainder temp - ior temp,temp - rtn -endif - rtn + branch clk2bt2 +//endif +// rtn endif @@ -1025,6 +990,18 @@ store 8,mem_gpio_wakeup_low rtn +p_g24_lpm_wait: + enable user + call lpo_calibration + fetch 3,mem_clks_per_lpo + branch disable_user,blank + fetch 1,mem_lpm_mode + branch disable_user,blank + fetch 1,mem_24g_transmit_by_interrupt + beq G24_TX_TIMER_INT_ENABLE,disable_user + fetch MOUSE_FLAG_LEN,mem_mouse_flag + rtnbit1 MOUSE_LOW_VOLTAGE_FLAG + //branch p_mouse_setgpio_lpm p_mouse_setgpio_lpm: call p_mouse_set_sdio_high call p_clear_wake @@ -1042,6 +1019,11 @@ hfetch 1,core_gpio_pd2 //flash hold pin gpio22 set0 6,pdata hstore 1,core_gpio_pd2 + + hfetch 1,core_gpio_pd0 + set0 5,pdata + hstore 1,core_gpio_pd0 + p_set_ice_gpio: fetcht 1,mem_mouse_bt_led_gpio call gpio_config_input @@ -1050,11 +1032,6 @@ arg core_gpio_pu0,contw branch gpio_set_bit -p_mouse_set_sdio_high: - fetch 1,mem_mouse_init_sensor_reset_flag - rtn blank - branch p_mouse_seting_sensor_type// make sdio high to make 100uA less - p_device_init: jam 0x86,0x895b jam 0xa0,0x895c @@ -1071,7 +1048,7 @@ endif call app_lpm_mult_enable call enable_authrom - branch p_device_wake_from_lpm,wake + branch p_mouse_spi_init,wake p_device_wake_from_power: ifdef DEBUGLOG ifdef DEBUGLOG_STATUS @@ -1096,26 +1073,12 @@ fetch 1,mem_power_on_flag bbit1 2,p_mouse_skip_24g_pair call p_mouse_check_key_gpio - beq MOUSE_LR_BUTTON,p_mouse_24g_pairing_button + beq MOUSE_LM_BUTTON,p_mouse_24g_pairing_button p_mouse_skip_24g_pair: endif p_mouse_check_reconn_target: - call p_mouse_tx_power_init - fetch 1,mem_device_flag - beq MODE_24G_DEVICE,p_mouse_connect_24g_mode - beq 0xff,p_mouse_connect_24g_mode - call p_mouse_mode_bt_device1_multi_led_on - fetch 1,mem_xrecord_mode -ifdef CLASSIC_BT - beq REC_3_MODE,p_mouse3_0_check_reconn_target -endif -ifdef BLE - beq REC_4_MODE,p_mouse4_0_check_reconn_target -endif - branch p_mouse_null_enter_hibernate_enable //enter hibernate if it is in its factory state - -p_device_wake_from_lpm: - branch p_mouse_spi_init + jam ZCODE_01,mem_zcode_temp_param0 + branch p_zcode_entrance p_mouse_tx_power_init: fetch 1,mem_tx_power_temp @@ -1126,11 +1089,6 @@ // fetch 1,mem_config_function_enable // branch mouse_cheak_select_device_by_switch+1 -p_mouse_connect_24g_mode: - jam MODE_24G_DEVICE,mem_device_flag - call p_mouse_mode_24g_device_multi_led_on - branch p_mouse_start_24g_mode - ifdef CLASSIC_BT p_mouse3_0_check_reconn_target: fetch 6,mem_hci_plap @@ -1200,10 +1158,13 @@ // store 1,mem_mouse_struct_led_gpio // branch mouse_led_on -p_mouse_spi_init: - jam 0x76,mem_spi_init_clk - branch mouse_spi_init - +p_mouse_clear_sensor_data: + jam 1,mem_mouse_clear_sensor_data_flag + call le_set_config_more_data + //branch p_mouse_init_sensor_reset +p_mouse_init_sensor_reset: + jam 1,mem_mouse_init_sensor_reset_flag + //branch p_mouse_init_sunt p_mouse_init_sunt: call p_mouse_spi_init call mouse_spi_sdio_gpio_pollup @@ -1217,10 +1178,6 @@ nop 1000 branch p_mouse_init_sensor -p_mouse_init_sensor_reset: - jam 1,mem_mouse_init_sensor_reset_flag - branch p_mouse_init_sunt - p_mouse_init_p32xx_id2_judge: call p_mouse_sensor_poweron fetch 1,mem_sensor_id2 @@ -1235,7 +1192,17 @@ call delay_10ms arg mem_sensor_8650_init,regc call p_sensor_wr_seq - branch p_mouse_dpi_config + //branch p_mouse_dpi_config +p_mouse_dpi_config: +// fetch MOUSE_FLAG_LEN,mem_mouse_flag +// bbit0 MOUSE_ENABLE_EEPROM,mouse_dpi_config + fetch 1,mem_mouse_dpi + beq 0xff,p_mouse_dpi_config_default + branch p_mouse_seting_dpi +p_mouse_dpi_config_default: + fetch 1,mem_config_sensor_motion + store 1,mem_mouse_dpi + branch p_mouse_seting_dpi p_sensor_wr_seq: ifetch 2,regc @@ -1276,31 +1243,13 @@ p_mouse_p3065_init_param: call p_mouse_sensor_poweron - fetch 1,mem_sensor_id2 - beq P3065_XY_ID2,mouse_p3065xy_init_param - jam P3065,mem_config_sensor_type - rtn - -p_mouse_sensor_poweron: - call p_mouse_spi_init - setarg 0x8006 // reset to factory settings - call twspi_write - branch p_mouse_dpi_config -// fetch 1,mem_sensor_id2 -// beq P8009_ID2,p_mouse_8009_init_param -// rtn - -p_mouse_dpi_config: -// fetch MOUSE_FLAG_LEN,mem_mouse_flag -// bbit0 MOUSE_ENABLE_EEPROM,mouse_dpi_config - fetch 1,mem_mouse_dpi - beq 0xff,p_mouse_dpi_config_default - branch p_mouse_seting_dpi -p_mouse_dpi_config_default: - fetch 1,mem_config_sensor_motion - store 1,mem_mouse_dpi - branch p_mouse_seting_dpi + branch mouse_p3065_init_param +p_mouse_sensor_powerdown_check: + fetch 1,mem_mouse_init_sensor_reset_flag + rtn blank + jam 0,mem_mouse_init_sensor_reset_flag + //branch p_mouse_sensor_powerdown p_mouse_sensor_powerdown: call p_mouse_init_sunt setarg 0x06 @@ -1323,10 +1272,8 @@ jam 0x40,core_spid_ctrl jam 0x0,core_spid_delay hfetch 1,core_gpio_sel1 - set0 0,pdata - set0 1,pdata - set1 3,pdata - set0 4,pdata + and pdata,0xec,pdata + or pdata,0x08,pdata hstore 1,core_gpio_sel1 setarg 0 store 4,mem_spid_tbuf @@ -1366,7 +1313,10 @@ call p_spid_write_flash call p_wait_flash_done call p_flash_deep_power_down - branch p_mouse_spi_init + //branch p_mouse_spi_init +p_mouse_spi_init: + jam 0x76,mem_spi_init_clk + branch mouse_spi_init p_mouse_set_24g_addr_flash: arg 4,temp @@ -1410,13 +1360,16 @@ arg mem_mouse_information_start,rega rtn -p_mouse_read_flash: - call p_flash_release_deep_power_down - call p_mouse_information_flash_parameters - branch spid_read_flash +//p_mouse_read_flash: +// call p_flash_release_deep_power_down +// call p_mouse_information_flash_parameters +// branch spid_read_flash p_mouse_load_flash_device_info: - call p_mouse_read_flash + //call p_mouse_read_flash + call p_flash_release_deep_power_down + call p_mouse_information_flash_parameters + call spid_read_flash call p_mouse_load_fast_conn_flag call p_mouse_load_random_addr_increase_count fetch 1,mem_device_flag @@ -1449,13 +1402,20 @@ p_flash_release_deep_power_down: jam FLASH_COMMAND_RELEASE_DEEP_POWER_DOWN,mem_temp branch p_spid_write_flash_cmd - + +p_mouse_connect_24g_mode: + jam MODE_24G_DEVICE,mem_device_flag + call p_mouse_mode_24g_device_multi_led_on + //branch p_mouse_start_24g_mode p_mouse_start_24g_mode: // fetch MOUSE_FLAG_LEN,mem_mouse_flag // rtnbit0 MOUSE_ENABLE_24G call p_g24_factory_check branch p_g24_auto_pair_start,user - branch p_g24_start_24g_mode + //branch p_g24_start_24g_mode +p_g24_start_24g_mode: + jam ZCODE_60,mem_zcode_temp_param0 + branch p_zcode_entrance p_g24_factory_check: arg 2,loopcnt @@ -1562,7 +1522,12 @@ setarg 0 store 1,mem_mouse_long_mult_flag store 4,mem_mouse_x - branch p_mouse_sensor_poweron + //branch p_mouse_sensor_poweron +p_mouse_sensor_poweron: + call p_mouse_spi_init + setarg 0x8006 // reset to factory settings + call twspi_write + branch p_mouse_dpi_config p_mouse_data_init: jam 7,mem_mouse_data_queue //data length @@ -1663,10 +1628,6 @@ istore 5,contw rtn -p_mouse_clear_sensor_data: - jam 1,mem_mouse_clear_sensor_data_flag - call le_set_config_more_data - branch p_mouse_init_sensor_reset endif //p_mouse_clear_sensor_data: @@ -1682,7 +1643,7 @@ p_mouse_dpi_check: call p_mouse_check_key_gpio - beq MOUSE_LM_BUTTON,p_mouse_dpi_down + beq MOUSE_RM_BUTTON,p_mouse_dpi_down branch mouse_dpi_up p_mouse_dpi_down: @@ -1728,12 +1689,10 @@ ifdef BLE p_mouse_le_bb_event_connected: - call p_mouse_init_sensor_reset jam ZCODE_B0,mem_zcode_temp_param0 branch p_zcode_entrance p_mouse_le_bb_disconnected: - call p_mouse_sensor_powerdown_check //sensor power down jam ZCODE_A2,mem_zcode_temp_param0 branch p_zcode_entrance @@ -1777,7 +1736,6 @@ branch mouse_stop_discovery p_mouse_bb_event_disconnected: - call p_mouse_sensor_powerdown_check //sensor power down jam ZCODE_B4,mem_zcode_temp_param0 branch p_zcode_entrance @@ -1788,12 +1746,10 @@ ifdef G24 p_mouse_24g_pairing_complete: - call p_mouse_init_sensor_reset jam ZCODE_92,mem_zcode_temp_param0 branch p_zcode_entrance p_mouse_24g_attempt_fail: - call p_mouse_sensor_powerdown_check //sensor power down jam ZCODE_A0,mem_zcode_temp_param0 branch p_zcode_entrance @@ -1805,17 +1761,9 @@ endif p_mouse_before_hibernate: - call p_mouse_sensor_powerdown_check jam ZCODE_A4,mem_zcode_temp_param0 branch p_zcode_entrance -p_mouse_sensor_powerdown_check: - fetch 1,mem_mouse_init_sensor_reset_flag - rtn blank - jam 0,mem_mouse_init_sensor_reset_flag - branch p_mouse_sensor_powerdown - - p_mouse_bb_event_timer: ifdef ADC_ENABLE call p_mouse_adc_read @@ -2122,10 +2070,24 @@ branch gpio_out_active p_mouse_multi_down_led_on: fetcht 1,mem_mouse_multi_led_gpio + call gpio_config_output + fetcht 1,mem_mouse_multi_led_gpio + branch gpio_out_inactive + + +p_mouse_low_voltage_led_on: + fetcht 1,mem_mouse_multi_led_gpio + set1 gpio_active_bit,temp call gpio_config_output fetcht 1,mem_mouse_multi_led_gpio - branch gpio_out_inactive - + branch gpio_out_active + +p_mouse_discovey_led_blink_off: + fetch 1,mem_mouse_multi_led_on_timer + nrtn blank + fetch 1,mem_mouse_multi_led_on_poweron2s_flag + nrtn blank + //branch p_mouse_multi_led_blink_off p_mouse_multi_led_blink_off: setarg 0 store 3,mem_mouse_multi_led_blink_timer @@ -2139,7 +2101,9 @@ jam OFF,mem_mouse_multi_led_state p_mouse_multi_led_off2: fetcht 1,mem_mouse_multi_led_gpio - call gpio_out_active + set0 gpio_active_bit,temp + call gpio_set_high_impedance + //call gpio_out_active p_mouse_bt_led_suspend: fetcht 1,mem_mouse_bt_led_gpio set0 gpio_active_bit,temp @@ -2164,13 +2128,6 @@ jam MULTI_LED_BLINK,mem_mouse_multi_led_type rtn -p_mouse_discovey_led_blink_off: - fetch 1,mem_mouse_multi_led_on_timer - nrtn blank - fetch 1,mem_mouse_multi_led_on_poweron2s_flag - nrtn blank - branch p_mouse_multi_led_blink_off - p_mouse_dpi_multi_led_blink: jam 3,mem_mouse_multi_led_blink_timer_init //300ms jam 1,mem_mouse_multi_led_blink_count_limited @@ -2197,7 +2154,6 @@ arg 0x0122,temp //compare to 2.9V isub temp,null ncall p_mouse_vlotage_sub,positive - store 2,mem_mouse_vdd_now_vol arg mem_mouse_vdd_calculate_set,rega call p_adc_bat_percent_lowpower_out @@ -2212,7 +2168,7 @@ fetch 1,mem_mouse_adc_last_low_voltage_flag rtn blank jam 0,mem_mouse_adc_last_low_voltage_flag - branch p_mouse_multi_led_off + branch p_mouse_multi_led_off2 p_mouse_vlotage_sub: arg 0x0b,temp @@ -2261,7 +2217,7 @@ fetch 1,mem_adc_low_volatage_led_timer_count pincrease 1 store 1,mem_adc_low_volatage_led_timer_count - beq 5,p_mouse_multi_led_on + beq 5,p_mouse_low_voltage_led_on sub pdata,10,null nbranch p_mouse_adc_low_volatage_led_timer_count_clean,positive rtn @@ -2290,6 +2246,10 @@ // branch p_mouse_adc_low_volatage_led_off endif +p_mouse_set_sdio_high: + fetch 1,mem_mouse_init_sensor_reset_flag + rtn blank + //branch p_mouse_seting_sensor_type// make sdio high to make 100uA less p_mouse_seting_dpi: p_mouse_seting_sensor_type: fetch 1,mem_config_sensor_type @@ -2348,7 +2308,7 @@ store 6,mem_mouse_x call p_mouse_cheak_sensor_data call mouse_zwheel - call mouse_t_zwheel + //call mouse_t_zwheel call p_mouse_key ifdef MOUSE_SMOOTHER nbranch p_mouse_motion_nodata,user @@ -2372,8 +2332,8 @@ p_mouse_check_key_gpio: arg 0,rega call p_mouse_check_lkey_gpio - call p_mouse_check_rkey_gpio - call p_mouse_check_mkey_gpio +// call p_mouse_check_rkey_gpio +// call p_mouse_check_mkey_gpio // call p_mouse_check_skey_gpio branch mouse_check_key_gpio_output //p_mouse_check_skey_gpio: @@ -2388,14 +2348,14 @@ fetcht 1,mem_lbutton_gpio call gpio_get_bit setflag true,0,rega //true = 1,input low level - rtn +// rtn p_mouse_check_rkey_gpio: fetcht 1,mem_rbutton_gpio call p_gpio_set_input_pu fetcht 1,mem_rbutton_gpio call gpio_get_bit setflag true,1,rega //true = 1,input low level - rtn +// rtn p_mouse_check_mkey_gpio: fetcht 1,mem_mbutton_gpio call p_gpio_set_input_pd @@ -2589,10 +2549,6 @@ call p_mouse_data_pull,blank branch le_prepare_tx+4 -p_le_prepare_tx_wak: - call p_le_check_tx_retransmit_setmd - branch p_le_power_ctrl_pac_succ_decrs - p_le_check_tx_retransmit_setmd: fetch 1,mem_le_connect_status_flag and pdata,0x03,pdata @@ -2604,20 +2560,22 @@ fetch 1,mem_le_txheader set1 md,pdata store 1,mem_le_txheader - call le_set_md -ifdef DEBUGLOG -ifdef DEBUGLOG_MISC - setarg DEBUGLOG_DTYPE_MISC - store 2,mem_debuglog_datatype - setarg MISC_LE_RETRANSMIT_MD - store 2,mem_debuglog_dataval - call debuglog_push -endif -endif - rtn + branch le_set_md +//ifdef DEBUGLOG +//ifdef DEBUGLOG_MISC +// setarg DEBUGLOG_DTYPE_MISC +// store 2,mem_debuglog_datatype +// setarg MISC_LE_RETRANSMIT_MD +// store 2,mem_debuglog_dataval +// call debuglog_push +//endif +//endif +// rtn - +p_le_prepare_tx_wak: + call p_le_check_tx_retransmit_setmd + //branch p_le_power_ctrl_pac_succ_decrs p_le_power_ctrl_pac_succ_decrs: ifdef DEBUGLOG ifdef DEBUGLOG_MISC @@ -2628,7 +2586,19 @@ call debuglog_push endif endif - branch power_ctrl_pac_succ_decrs + //branch power_ctrl_pac_succ_decrs +power_ctrl_pac_succ_decrs: + fetch 1,mem_power_ctrl_pac_succ_cnt + sub pdata,2,null + ncall power_ctrl_pac_succ_cnt_reinit,positive + fetch 1,mem_power_ctrl_pac_succ_cnt + rtneq 0 + increase -1,pdata + store 1,mem_power_ctrl_pac_succ_cnt + rtn +power_ctrl_pac_succ_cnt_reinit: + jam 3,mem_power_ctrl_pac_succ_cnt + rtn p_mouse_le_reconn_write_enable_timer_reinit: fetch 1,mem_mouse_le_reconnect_flag @@ -2744,37 +2714,33 @@ nbranch p_le_send_att_read_response,zero call le_check_encrypt_state nbranch p_le_send_att_read_response,user - jam ATT_ERR_INSUFFICIENT_AUTHENTICATION,mem_le_err_code - branch le_send_att_error_response + branch le_send_att_read_response_check_auth_next - p_le_parse_smp: ifetch 1,contr beq SMP_PAIRING_REQUEST,p_le_parse_smp_pairing_request - beq SMP_PAIRING_FAILED,p_le_parse_smp_pairing_failed branch le_parse_smp+2 p_le_parse_smp_pairing_request: jam 1,mem_le_send_security_request_flag branch le_parse_smp_pairing_request - -p_le_parse_smp_pairing_failed: - jam ZCODE_82,mem_zcode_temp_param0 - branch p_zcode_entrance p_le_adv_not_match: fetch 1,mem_le_ch_mapped bne 39,le_adv_loop - call p_le_adv_random_delay - arg le_adv_interval_timer,queue - fetch 2,mem_le_adv_interval - branch timer_init -p_le_adv_random_delay: + //call p_le_adv_random_delay random pdata arg 0x1ff,temp iand temp,pdata add pdata,250,pdata - branch delay + call delay + branch le_adv_not_match2 +//p_le_adv_random_delay: +// random pdata +// arg 0x1ff,temp +// iand temp,pdata +// add pdata,250,pdata +// branch delay p_le_lpm_setmult: disable wake @@ -2816,9 +2782,8 @@ call spid_init_common p_twspi_enable: hfetch 1,core_gpio_sel1 - set1 0,pdata - set0 1,pdata - set0 3,pdata + or pdata,0x01,pdata + and pdata,0xf5,pdata hstore 1,core_gpio_sel1 //enable spi rtn @@ -3134,18 +3099,7 @@ increase 1,pdata store 1,mem_power_ctrl_pac_succ_cnt rtn -power_ctrl_pac_succ_decrs: - fetch 1,mem_power_ctrl_pac_succ_cnt - sub pdata,2,null - ncall power_ctrl_pac_succ_cnt_reinit,positive - fetch 1,mem_power_ctrl_pac_succ_cnt - rtneq 0 - increase -1,pdata - store 1,mem_power_ctrl_pac_succ_cnt - rtn -power_ctrl_pac_succ_cnt_reinit: - jam 3,mem_power_ctrl_pac_succ_cnt - rtn + power_ctrl_start: fetch 2,mem_ui_state_map @@ -3295,7 +3249,11 @@ // branch set_tx_power_3db p_set_tx_power_5db: - call p_rx_high_sens + //call p_rx_high_sens + jam 0xfb,0x894c + jam 0xef,0x894d + jam 0xec,0x894e + jam 0x5e,0x894f // jam 0xba,0x894b jam 0xd0,0x8955 jam 0xe0,0x8956 @@ -3331,12 +3289,12 @@ jam 0x46,0x894f rtn -p_rx_high_sens: - jam 0xfb,0x894c - jam 0xef,0x894d - jam 0xec,0x894e - jam 0x5e,0x894f - rtn +//p_rx_high_sens: +// jam 0xfb,0x894c +/// jam 0xef,0x894d +// jam 0xec,0x894e +// jam 0x5e,0x894f +// rtn p_set_tx_power_pair: //50-100cm distance // jam 0xba,0x894b @@ -3521,11 +3479,6 @@ ifdef MOUSE_SMOOTHER //notice: need to call p_mouse_drawing_optima_init when waked from mult -p_drawing_optima_init: - arg 5,loopcnt - arg mem_mouse_asm_flag,contw - branch clear_mem - p_drawing_optima: fetch 4,mem_mouse_x rtn blank @@ -3536,7 +3489,11 @@ call p_data_less_than_check fetch 1,mem_mouse_asm_flag beq 1,p_drawing_optima_modify - branch p_drawing_optima_init + //branch p_drawing_optima_init +p_drawing_optima_init: + arg 5,loopcnt + arg mem_mouse_asm_flag,contw + branch clear_mem p_drawing_optima_modify: fetch 2,mem_mouse_x_pre Index: program/utility.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/utility.prog (revision 5062) +++ /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/utility.prog (working copy) @@ -327,6 +327,7 @@ call wait_div_end quotient pdata lshift16 pdata,pdata +clk2bt2: remainder temp ior temp,temp rtn Index: program/z.prog =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/z.prog (revision 5062) +++ /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/program/z.prog (working copy) @@ -2,6 +2,7 @@ org 0x10001 z_entrance0: beq ZCODE_00,z_page_wait_fhs_reply_ok + beq ZCODE_01,z_mouse_check_reconn_target rtn z_page_wait_fhs_reply_ok: @@ -21,7 +22,20 @@ set0 mark_first_packet,mark branch newconn_poll_responded - +z_mouse_check_reconn_target: + call p_mouse_tx_power_init + fetch 1,mem_device_flag + beq MODE_24G_DEVICE,p_mouse_connect_24g_mode + beq 0xff,p_mouse_connect_24g_mode + call p_mouse_mode_bt_device1_multi_led_on + fetch 1,mem_xrecord_mode +ifdef CLASSIC_BT + beq REC_3_MODE,p_mouse3_0_check_reconn_target +endif +ifdef BLE + beq REC_4_MODE,p_mouse4_0_check_reconn_target +endif + branch p_mouse_null_enter_hibernate_enable //enter hibernate if it is in its factory state org 0x20001 @@ -556,7 +570,8 @@ z_mouse_setting_config: ifdef G24 - call p_g24_set_device_addr + fetch 4,mem_lap + store 4,mem_24g_device_addr endif // //disable usb function // hfetch 1,core_usb_config @@ -685,6 +700,7 @@ branch enable_user z_g24_paring_mode: + call power_ctrl_pac_succ_cnt_init fetch 1,mem_24g_pairing_sm rtneq STATE_24G_PAIRING_SUCCESS beq STATE_24G_PAIRING_1_WAITING_ACK,z_g24_pairing_sm_1_waiting_ack @@ -708,6 +724,7 @@ z_mouse_24g_pairing_complete: + call p_mouse_init_sensor_reset jam 1,mem_mouse_24g_enter_lpm_enable arg MOSUE_24G_PAIRING_FLAG,queue call mouse_disable_function_flag @@ -736,6 +753,7 @@ rtn z_mouse_24g_attempt_fail: + call p_mouse_sensor_powerdown_check //sensor power down jam G24_TX_TIMER_INT_DISABLE,mem_24g_transmit_by_interrupt call p_mouse_tx_power_init call p_g24_check_51cmd_stop_24g @@ -769,6 +787,7 @@ branch app_bb_hibernate z_mouse_le_bb_disconnected: + call p_mouse_sensor_powerdown_check //sensor power downs jam 0,mem_mouse_le_bb_connected_flag setarg LE_INTERVAL_8_75MS store 2,mem_le_interval_min @@ -781,6 +800,7 @@ z_mouse_before_hibernate: + call p_mouse_sensor_powerdown_check enable user hfetch 4,0x8138 setflag user,26,pdata @@ -810,6 +830,7 @@ rtn z_mouse_le_bb_event_connected: + call p_mouse_init_sensor_reset fetch APP_DISC_RSN_SIZE,mem_app_disconn_reason_flag set0 APP_DISC_PB_BUTTON,pdata store APP_DISC_RSN_SIZE,mem_app_disconn_reason_flag @@ -849,6 +870,7 @@ branch mouse_le_enable_connect_flag z_mouse_bb_event_disconnected: + call p_mouse_sensor_powerdown_check //sensor power down jam 0,mem_bt_rcvd_switch_req_accept jam 0,mem_bt_send_lmp_setup_complete jam 0,mem_mouse_bt_send_first_package_flag Index: sched/mouse.dat =================================================================== --- /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/sched/mouse.dat (revision 5062) +++ /branch/mouse_project/YJX_Project/YJX_1059/PB_Switch_YJX_503_Low_Voltage/sched/mouse.dat (working copy) @@ -148,8 +148,8 @@ mem_adc_config_flag:00 #0 vinlpm 1 hvin 2 gpio mem_adc_channel:00 #gpio5 mem_mouse_vdd_full_vol:72 01#3.7V -08 01#mem_mouse_vdd_empty_vol:5a 00# 2.6V -0e 01#mem_mouse_vdd_low_vol:64 00 #2.7v +18 01#mem_mouse_vdd_empty_vol:5a 00# 2.8V +2c 01#mem_mouse_vdd_low_vol:64 00 #3.0v mem_config_sensor_type:00 02 #mem_config_sensor_motion:02 @@ -235,7 +235,7 @@ #24g init mem_24g_mode:01#tx mem_24g_data_type:01 #mouse 1,kb 2 -mem_24g_max_retry:04#max tx retry +mem_24g_max_retry:06#max tx retry mem_24g_no_ack:00#with ack mem_24g_rx_window:c0 12 #400us mem_24g_interval:19