Index: do.bat =================================================================== --- /1121s/branch/mouse/YJX_Project/mouse_public_yjx/do.bat (revision 1999) +++ /1121s/branch/mouse/YJX_Project/mouse_public_yjx/do.bat (working copy) @@ -86,7 +86,7 @@ goto contin :SBmode -%util_path%/geneep -n -s +%util_path%/geneep -n -s -i goto contin :contin Index: output/otp.dat =================================================================== --- /1121s/branch/mouse/YJX_Project/mouse_public_yjx/output/otp.dat (revision 1999) +++ /1121s/branch/mouse/YJX_Project/mouse_public_yjx/output/otp.dat (working copy) @@ -9,5450 +9,26 @@ 00 00 00 -b9 -f6 -d7 -64 -cd -4b -e5 -07 -c5 -57 -52 -bc -0c -e2 -83 -df -aa -55 -30 -15 -bc -02 -79 -93 -18 -ac -92 -96 -ff -97 -c5 -e1 -30 -b4 -2f -65 -a8 -ca -d6 -ad -6a -20 -c6 -de -c6 -23 -26 -f4 -d1 -48 -bb -d1 -b3 -ff -56 -2b -aa -c4 -15 -f9 -a0 -a7 -63 -87 -35 -9c -46 -7e -e9 -31 -d8 -36 -26 -b8 -1f -51 -4a -8f -43 -76 -61 -d6 -9e -7f -75 -b9 -81 -93 -f0 -8e -d7 -28 -68 -d6 -84 -4f -9e -32 -14 -76 -c0 -3e -66 -cb -6f -5a -aa -0b -b7 -38 -43 -64 -ee -fc -08 -13 -0a -fb -10 -98 -7c -6d -8c -2f -0a -d8 -78 -a2 -d7 -20 -f8 -c0 -97 -bb -04 -9f -99 -ee -ca -59 -3f -45 -c9 -54 -8a -b8 -6a -18 -b6 -ce -60 -83 -c4 -19 -d8 -4e -3c -db -3e -14 -41 -24 -96 -88 -95 -e9 -d8 -7c -a8 -7f -03 -61 -5e -d9 -d4 -6f -31 -68 -dd -af -87 -3a -1e -ea -41 -e5 -fa -2a -b6 -da -96 -6a -d8 -92 -a3 -24 -1b -77 -90 -19 -66 -94 -1c -48 -ec -5e -4a -51 -6b -55 -e6 -91 -b6 -78 -75 -eb -6e -cf -a0 -49 -87 -14 -0c -0e -92 -5d -17 -8a -2a -d6 -7b -a6 -31 -56 -fa -e2 -7f -6b -e2 -92 -2c -0c -f2 -e7 -80 -a4 -b6 -6b -20 -f4 -23 -a3 -b1 -16 -4d -51 -3b -14 -79 -54 -9e -67 -9e -a3 -a2 -db -6c -01 -4d -21 -14 -3a -5c -6c -d2 -0e -d4 -fa -8f -fe -ed -cf -4d -4d -d2 -0d -74 -e9 -90 -85 -a4 -63 -3c -2d -ff -d8 -16 -42 -83 -c0 -e8 -f3 -78 -09 -d8 -16 -f6 -f8 -5d -c9 -76 -49 -6e -b8 -3d -74 -62 -79 -01 -10 -07 -7a -88 -d0 -c3 -91 -2a -11 -c0 -62 -1b -e1 -87 -ed -b8 -b9 -16 -f2 -a4 -f8 -02 -bb -1e -c6 -90 -ab -90 -39 -88 -54 -2c -8c -ea -6f -a3 -5d -cc -83 -ad -60 -44 -71 -8d -0b -2b -68 -1f -96 -fb -98 -3b -10 -dd -8d -00 -29 -c2 -d2 -40 -19 -99 -70 -eb -7a -bf -d6 -20 -f7 -93 -09 -ec -9e -c8 -8e -75 -11 -23 -d5 -89 -2d -a7 -7e -99 -07 -24 -39 -a9 -96 -c4 -05 -ff -29 -52 -ea -19 -41 -be -ac -1e -11 -0b -ea -65 -82 -37 -80 -c3 -39 -ce -82 -2a -a7 -ba -ff -c7 -89 -ad -28 -f7 -e2 -d4 -96 -e9 -72 -c4 -8a -57 -43 -00 -bf -8a -7b -dd -7b -9c -0b -1b -6f -96 -bb -6e -4b -f0 -e3 -ad -85 -b0 -e8 -00 -fc -e4 -4d -d4 -bf -b7 -55 -c5 -1b -06 -2c -16 -1c -03 -05 -d6 -6b -a4 -7d -c8 -79 -1a -49 -d4 -a6 -04 -11 -bc -cf -19 -b1 -14 -31 -cc -cb -aa -1f -23 -64 -80 -df -bd -f6 -46 -f2 -9b -6e -f5 -84 -84 -19 -52 -9a -7b -f9 -7a -67 -5f -ed -33 -41 -5c -72 -4a -31 -65 -36 -5d -7a -70 -0c -41 -d1 -59 -d5 -b8 -eb -21 -be -32 -ec -51 -f1 -ae -7a -ed -b4 -a3 -59 -db -f1 -b6 -d4 -82 -5c -9e -dd -09 -c7 -20 -11 -52 -2e -09 -46 -c7 -37 -30 -e6 -fd -a5 -51 -37 -85 -80 -9b -5f -4b -36 -92 -c4 -8d -8a -db -7f -46 -b6 -e7 -5c -7c -db -ed -95 -59 -7c -31 -fc -4c -40 -46 -40 -ea -6f -74 -7e -0c -cd -de -a8 -97 -b9 -b9 -d8 -9b -0d -7b -7c -c5 -61 -b0 -d1 -b8 -43 -12 -80 -b6 -ca -19 -a1 -99 -e6 -d9 -0a -30 -95 -fc -a2 -63 -69 -c1 -59 -44 -17 -32 -57 -bd -98 -d5 -32 -f4 -17 -97 -f8 -c1 -3f -e4 -54 -d3 -73 -0b -86 -0c -6f -51 -18 -d1 -c9 -27 -15 -4f -61 -38 -cf -4d -8a -47 -34 -b5 -47 -bc -ef -a0 -bf -f0 -dc -35 -b7 -dc -2f -d9 -fe -1a -88 -4e -66 -36 -74 -42 -e9 -ad -cd -86 -42 -03 -79 -41 -20 -65 -8a -2c -67 -e9 -cd -c4 -9f -54 -9b -48 -d6 -a5 -f3 -61 -45 -7c -24 -b6 -ce -2e -ca -3c -ee -f4 -e0 -a7 -aa -2d -bc -53 -68 -a9 -a4 -60 -4d -fa -a5 -f8 -64 -81 -8a -cd -d1 -5a -80 -71 -1e -67 -8f -64 -40 -f7 -11 -50 -29 -81 -9a -00 -10 -70 -da -93 -e8 -1d -f8 -fd -80 -a6 -81 -f9 -b4 -43 -2d -b6 -16 -74 -b1 -6f -ce -f0 -d3 -f0 -1d -8b -4c -ee -e0 -c2 -5b -b0 -01 -40 -6b -9d -28 -80 -57 -8b -a1 -f3 -f6 -19 -77 -c2 -bf -6b -a2 -ce -c0 -07 -5e -45 -be -4f -a4 -c5 -d8 -30 -5f -92 -c9 -8f -ae -f4 -f0 -94 -27 -d4 -4b -3a -86 -b0 -02 -b6 -23 -97 -60 -ca -34 -df -ff -49 -84 -a5 -36 -65 -b1 -a3 -49 -89 -22 -88 -7b -43 -75 -b2 -b4 -1f -ea -18 -c6 -4a -b0 -aa -dd -e0 -8f -44 -c2 -85 -52 -5d -da -d0 -c3 -b5 -33 -3d -b3 -1e -c5 -71 -ef -05 -52 -89 -e0 -5d -43 -c7 -9e -f7 -6d -f3 -14 -00 -28 -dc -c2 -59 -b6 -be -19 -8d -a3 -56 -c8 -37 -5f -86 -24 -4b -ac -e9 -25 -4f -f1 -33 -68 -27 -c1 -49 -38 -e0 -0d -94 -f9 -56 -de -2c -c4 -1a -ea -a6 -92 -fa -ee -67 -99 -b1 -27 -60 -38 -7b -13 -d0 -45 -3d -9d -14 -5b -56 -90 -f9 -9d -59 -0b -21 -c5 -98 -95 -c8 -ca -84 -f5 -1e -3c -d3 -dc -b9 -0b -3c -74 -d1 -97 -32 -84 -28 -9c -3d -73 -ec -f0 -c7 -87 -a1 -fa -b6 -b0 -26 -69 -cf -b6 -2c -bf -1f -a9 -18 -05 -2c -2d -44 -95 -e8 -e3 -02 -3f -4c -b2 -c9 -8e -59 -0d -91 -a8 -0a -c8 -5c -56 -be -e4 -14 -6c -45 -07 -eb -28 -64 -b8 -8b -f2 -cb -80 -89 -8f -de -cd -c5 -32 -22 -46 -af -b1 -94 -d2 -fa -3b -f0 -f7 -4e -49 -0d -44 -57 -07 -98 -e1 -20 -de -ac -a1 -0c -82 -98 -a0 -61 -57 -6e -3c -8a -10 -da -b1 -f8 -3e -2c -41 -f0 -a2 -ca -16 -ab -63 -10 -88 -53 -47 -69 -b2 -e8 -e4 -87 -2e -c1 -3b -fb -76 -4f -2b -8b -d8 -d3 -41 -96 -99 -6c -d6 -17 -2e -49 -17 -97 -3a -28 -6f -2a -ff -cf -77 -fd -6e -28 -fe -a9 -6f -10 -51 -c6 -c1 -cb -99 -07 -e3 -6a -52 -74 -30 -73 -23 -c0 -e5 -ea -e9 -ac -70 -ce -60 -b4 -77 -b2 -0e -3e -4c -73 -8e -5c -ce -a5 -fb -23 -8c -cc -5c -04 -8f -45 -b2 -40 -27 -a6 -6b -96 -d4 -d1 -33 -7c -c4 -b9 -a8 -fc -e8 -2b -d6 -63 -f4 -98 -cf -a8 -19 -b7 -3a -c3 -a7 -9f -00 -c1 -2c -c0 -e0 -a8 -b3 -6e -bd -29 -a6 -2b -9b -9d -3a -4a -9f -8b -c5 -61 -ec -2d -6c -c8 -44 -1e -f3 -d1 -fc -e3 -62 -be -fd -c3 -a3 -be -4b -08 -cb -3f -fd -20 -d6 -94 -04 -3e -41 -04 -2f -ce -84 -81 -5a -e2 -a4 -c2 -1b -14 -af -17 -7a -b5 -71 -04 -22 -bf -3f -5b -c8 -4f -3c -c5 -3f -17 -c8 -f7 -c3 -ec -32 -97 -89 -0e -5e -f9 -a1 -ce -63 -6c -7e -42 -60 -5b -d4 -77 -4e -70 -04 -8b -ec -8d -36 -2c -68 -90 -c1 -3b -c1 -20 -0e -31 -9d -11 -23 -10 -ca -6d -05 -c6 -51 -fd -44 -2d -01 -e4 -11 -79 -05 -03 -31 -25 -90 -25 -4d -75 -60 -7a -45 -3d -51 -aa -f7 -db -5e -90 -d8 -d8 -6c -92 -2f -5c -8c -cb -1d -59 -8f -ff -ac -73 -1e -6b -ff -dd -d3 -07 -f9 -b9 -2a -c3 -90 -79 -50 -36 -0a -57 -67 -a5 -56 -a3 -65 -db -10 -05 -b7 -f8 -9d -56 -55 -4c -33 -3a -d4 -03 -a1 -66 -a5 -af -5f -19 -df -42 -65 -6d -a4 -ca -b4 -4c -f2 -1f -27 -bd -a5 -e4 -55 -ce -ac -6e -b9 -e5 -35 -f7 -4c -dc -9d -7b -bd -77 -2d -7f -cd -c5 -dd -79 -29 -f1 -4c -dc -9a -b3 -8c -50 -a7 -d2 -34 -61 -b0 -61 -08 -36 -fd -cd -11 -02 -12 -aa -70 -02 -2c -f7 -4f -d9 -bd -2f -9c -43 -c7 -75 -e2 -3e -53 -3b -e2 -97 -18 -07 -e4 -6f -2e -11 -79 -27 -00 -ca -02 -27 -02 -06 -e4 -53 -38 -ff -e8 -1e -55 -c2 -4f -3f -92 -e1 -e5 -78 -6a -88 -33 -6b -ec -08 -54 -81 -3d -82 -32 -33 -5f -10 -43 -60 -12 -ca -a2 -fc -67 -59 -c7 -ce -ec -84 -5c -ab -18 -30 -f5 -42 -90 -45 -e7 -49 -e8 -5e -90 -8d -ef -56 -3e -ff -e1 -ab -a5 -89 -f0 -52 -54 -fa -78 -5b -d4 -12 -19 -dd -75 -f5 -39 -81 -ef -67 -39 -73 -1a -c1 -38 -b5 -00 -da -b0 -f7 -6b -4e -54 -57 -be -c9 -d7 -75 -39 -e4 -ce -0f -c2 -ef -08 -84 -de -6c -15 -9d -97 -83 -26 -e9 -a6 -38 -b4 -16 -a6 -0f -74 -8b -13 -94 -c1 -f3 -3d -60 -7f -7e -22 -e7 -fd -90 -72 -17 -00 -2d -32 -00 -d6 -61 -c6 -a7 -6b -4e -90 -2f -09 -7f -0e -28 -98 -78 -b1 -96 -1f -77 -83 -8d -15 -26 -2e -e7 -ef -b4 -7a -02 -7b -91 -34 -13 -8d -f9 -ca -fa -8e -39 -e7 -f4 -08 -68 -2d -d8 -de -42 -6b -84 -a3 -cc -67 -5a -8a -e1 -a9 -41 -3a -a6 -58 -9b -00 -75 -ce -c5 -e1 -a4 -22 -64 -d7 -ac -3a -9e -67 -9b -b8 -dd -40 -b7 -cd -be -5a -8e -d8 -03 -f0 -b5 -68 -26 -f7 -1c -d4 -67 -c9 -72 -c4 -f1 -89 -51 -91 -ba -df -40 -94 -7a -e0 -2d -32 -60 -b0 -91 -df -7d -13 -4a -54 -6a -6e -5f -00 -a3 -cf -ea -e6 -1c -8f -65 -da -c2 -f0 -f6 -a2 -ae -da -06 -72 -c0 -6c -52 -bb -70 -c9 -73 -7f -5d -10 -7e -81 -6a -dd -7f -30 -25 -73 -1d -7a -20 -f8 -25 -03 -80 -eb -a6 -c3 -5c -9c -c3 -e0 -72 -36 -b0 -a3 -d8 -47 -c3 -07 -3a -37 -01 -92 -39 -9f -38 -b4 -dd -44 -0f -50 -97 -52 -92 -fd -12 -ba -94 -97 -38 -5d -eb -77 -75 -79 -a2 -d5 -a2 -40 -7c -29 -50 -aa -22 -b2 -68 -56 -9c -27 -89 -84 -cc -41 -3f -6f -3a -19 -14 -d8 -92 -64 -74 -af -30 -7c -62 -68 -65 -35 -40 -03 -b8 -71 -94 -19 -d4 -3b -98 -52 -d5 -57 -8b -e4 -ae -b1 -3f -7c -e7 -15 -73 -f7 -07 -6a -34 -ff -af -ba -4b -30 -75 -c4 -8b -6c -70 -ae -49 -d3 -74 -08 -89 -a4 -04 -c2 -a5 -54 -c6 -2b -cc -da -44 -74 -85 -9f -d9 -3f -a5 -52 -89 -4b -2a -b1 -87 -1f -f6 -e0 -35 -2d -24 -7b -c7 -b1 -64 -05 -c6 -7a -8c -c0 -c5 -a5 -da -0f -41 -9b -fb -da -f2 -c9 -5f -4f -ce -c9 -9b -b8 -0a -26 -3e -0f -3f -4c -80 -01 -b4 -aa -7a -8b -a4 -8c -49 -b1 -ab -ea -83 -25 -fb -77 -2d -aa -48 -38 -17 -e5 -40 -22 -31 -9c -9f -7a -97 -7c -98 -03 -ae -f8 -d4 -3c -0d -b8 -03 -be -ee -69 -ec -95 -0e -54 -d4 -ed -4d -20 -75 -53 -18 -59 -44 -15 -cd -5b -a4 -8b -2a -b1 -9b -76 -e0 -c2 -5c -fd -11 -a4 -39 -d0 -cd -72 -9f -ef -41 -b6 -28 -f0 -fd -02 -20 -a3 -15 -c2 -b4 -c3 -8a -63 -92 -14 -7d -15 -61 -b7 -4c -00 -bc -0d -ab -00 -82 -62 -43 -71 -88 -9e -a6 -0c -37 -2b -4e -61 -ee -43 -dd -2a -17 -a0 -54 -47 -25 -c8 -d5 -ae -ed -a0 -17 -06 -67 -aa -bc -d9 -c8 -60 -3f -d3 -63 -93 -b7 -e0 -d5 -bd -44 -b8 -a8 -74 -25 -56 -d9 -a3 -49 -98 -f9 -d2 -15 -be -82 -18 -59 -ff -2e -86 -00 -40 -83 -d5 -e9 -83 -2c -e4 -76 -54 -55 -de -da -5f -e3 -58 -bd -3a -63 -29 -d3 -44 -86 -57 -13 -f0 -28 -5c -3e -2d -09 -05 -f4 -2b -17 -6a -5a -e9 -c3 -03 -8a -cb -e5 -e5 -0a -7d -aa -ce -9c -ad -0e -f7 -b4 -b2 -d9 -9d -d6 -30 -db -93 -27 -67 -0e -81 -5a -06 -43 -ad -2f -3f -95 -b4 -16 -a7 -93 -c9 -fb -30 -d2 -5a -38 -92 -da -57 -11 -f0 -bf -10 -d4 -5e -c9 -09 -5a -55 -49 -d0 -47 -c6 -58 -a9 -bd -fd -5e -78 -e6 -fd -0b -ee -12 -9e -b4 -36 -40 -0f -96 -26 -ed -10 -76 -33 -17 -dd -4b -b4 -ca -f3 -ec -07 -ea -62 -6c -04 -c6 -7d -5b -f3 -83 -95 -fd -6b -ca -f3 -03 -14 -a6 -5f -cb -21 -21 -11 -91 -a0 -4f -38 -20 -ab -c7 -ff -4d -9c -5b -8e -7c -65 -fc -95 -9d -5d -03 -5c -b0 -1b -02 -79 -a4 -e6 -4f -10 -b2 -ed -2c -fa -96 -2b -b7 -ae -b9 -01 -7d -70 -0c -2d -d6 -46 -ce -26 -84 -01 -ec -b4 -c4 -13 -39 -67 -5b -88 -80 -59 -c0 -c1 -ad -14 -68 -ae -92 -d3 -2d -0a -25 -77 -b3 -26 -b4 -58 -71 -92 -5a -4f -6b -22 -d1 -64 -7e -7b -bf -83 -13 -2f -2f -c3 -be -14 -ff -78 -38 -03 -a9 -18 -a3 -78 -20 -ed -f1 -7b -8b -d6 -97 -5e -6b -2d -fb -1f -ae -ca -52 -e9 -4d -fb -18 -a3 -d4 -33 -9a -0b -84 -b6 -aa -04 -9e -01 -ec -dd -fe -30 -ad -95 -69 -a5 -71 -e3 -8b -19 -f7 -28 -f7 -6a -ee -cc -2c -07 -62 -49 -6e -5c -eb -ae -b0 -5d -f9 -5d -2d -24 -6c -f9 -ca -8f -11 -38 -ac -1d -82 -ca -98 -60 -b1 -3f -52 -8c -04 -d8 -9f -79 -a9 -f3 -7a -a3 -5a -81 -a1 -7d -40 -71 -d2 -8a -df -a8 -f7 -45 -03 -0c -1b -66 -60 -b5 -14 -af -84 -2b -1c -c8 -84 -4f -78 -c6 -9b -37 -de -e0 -11 -92 -16 -73 -90 -bb -73 -66 -f6 -24 -c7 -2e -60 -57 -83 -08 -45 -07 -90 -0a -e9 -fe -81 -17 -ca -c5 -98 -95 -3c -8c -0b -a8 -69 -ad -6f -26 -c9 -7a -b1 -0d -a7 -cc -ff -b8 -97 -d0 -3f -f6 -ba -16 -47 -57 -fd -fa -2c -13 -d5 -bb -c3 -6d -d5 -c9 -1d -4f -70 -80 -f8 -c9 -24 -79 -d0 -1d -b3 -4c -15 -66 -9a -71 -72 -b6 -60 -76 -a3 -50 -55 -cd -7a -55 -70 -7a -00 -22 -6d -61 -c1 -b3 -30 -9e -b6 -0a -15 -d3 -9d -27 -13 -a6 -02 -ca -23 -fb -4a -79 -f9 -bd -cb -05 -7b -92 -95 -18 -8b -8b -bb -dd -29 -ba -1b -e4 -a3 -af -dc -77 -99 -d8 -f4 -58 -cf -97 -02 -11 -3f -cf -17 -80 -12 -f4 -54 -f1 -b6 -f3 -1a -a9 -fe -5c -fd -16 -d1 -a5 -ce -18 -00 -13 -b3 -0e -45 -9a -52 -0f -91 -99 -7b -6d -33 -94 -c0 -68 -61 -36 -99 -02 -d4 -f1 -f1 -65 -1d -59 -af -4b -c6 -4b -d5 -f2 -aa -da -02 -ea -9d -42 -80 -bf -b0 -19 -f2 -ba -2b -6a -8b -b3 -ad -04 -95 -cd -80 -c0 -8e -2e -83 -04 -6b -c6 -e0 -06 -ba -37 -66 -fb -46 -4d -cf -89 -4e -94 -7a -73 -67 -aa -b7 -1b -6e -b2 -06 -e3 -98 -9a -33 -3a -62 -12 -e1 -b7 -57 -96 -3c -ef -1e -8f -70 -a1 -2d -23 -9a -35 -a9 -ed -ad -3a -cf -5c -33 -5a -27 -f6 -db -e4 -fe -f4 -c1 -cb -5a -a7 -c1 -ac -bf -15 -32 -3d -81 -93 -aa -16 -8c -2e -2c -21 -43 -be -fe -64 -13 -44 -9b -17 -a8 -a2 -5e -f3 -66 -9e -f5 -da -c6 -4e -dc -c1 -0b -b8 -74 -a1 -a8 -21 -ce -39 -c1 -9f -8e -68 -c7 -c9 -e8 -17 -af -7c -1e -f7 -2c -05 -3a -cf -9d -7f -8f -02 -7f -c9 -21 -55 -b9 -00 -4c -47 -1a -11 -01 -98 -74 -13 -dc -b8 -0d -27 -f8 -b4 -7d -0d -85 -19 -05 -17 -38 -ad -b1 -36 -4e -dd -aa -29 -4e -ad -bb -5a -5d -31 -7c -98 -48 -31 -0a -f8 -1a -b6 -83 -93 -a7 -cf -fa -3a -af -88 -e5 -bb -58 -a5 -17 -21 -46 -84 -3e -66 -35 -50 -17 -d3 -5e -3d -cd -ae -2e -ab -93 -65 -97 -3a -cd -fd -70 -66 -ed -3a -8e -90 -5c -31 -18 -82 -4e -72 -4b -10 -80 -15 -c6 -9f -92 -db -1b -aa -05 -64 -f8 -0b -db -c7 -14 -4f -c6 -9d -22 -5e -b7 -c6 -86 -f2 -6d -0f -c5 -42 -69 -0c -1a -36 -bf -8f -53 -85 -24 -a1 -93 -0f -1d -31 -0c -e6 -c3 -6a -83 -31 -98 -90 -a7 -51 -39 -52 -8b -72 -a9 -3a -eb -d5 -64 -50 -bc -44 -dd -f9 -35 -2f -a8 -8b -b6 -1c -10 -53 -19 -59 -96 -46 -d0 -ee -a9 -ca -0b -2c -d8 -3d -a3 -cf -9c -77 -27 -ae -08 -a0 -f8 -ec -dc -35 -df -9d -3d -04 -9b -c6 -b3 -36 -35 -ca -95 -94 -2a -61 -29 -26 -34 -7d -ce -c1 -28 -d4 -40 -10 -99 -fd -08 -f2 -a3 -79 -1a -d8 -72 -3d -08 -c2 -38 -b6 -4c -02 -fd -79 -82 -5d -19 -74 -d5 -e7 -68 -96 -e1 -79 -3d -a9 -3b -53 -20 -64 -d2 -f8 -c6 -07 -68 -15 -ec -b7 -c0 -71 -a6 -cb -84 -b0 -70 -86 -ee -99 -ea -53 -6f -fc -4c -d3 -4b -ca -a2 -44 -87 -71 -49 -d5 -af -4b -30 -0d -98 -1d -47 -2a -33 -62 -d1 -88 -86 -79 -46 -e4 -32 -ea -68 -bd -58 -c3 -15 -0d -8c -5b -87 -67 -98 -fe -c8 -33 -d7 -1c -10 -f9 -1a -87 -70 -49 -61 -d0 -d9 -6a -53 -c2 -7a -92 -2e -cb -93 -d9 -d3 -bc -42 -f4 -8f -0e -bb -97 -31 -06 -f1 -41 -60 -a6 -c6 -df -58 -44 -59 -04 -62 -9a -9b -b5 -88 -f6 -25 -4c -dd -02 -c3 -a9 -23 -c7 -15 -85 -8f -fb -86 -e8 -d3 -78 -f0 -a0 -45 -bc -bb -c4 -31 -16 -ec -f3 -36 -e6 -56 -fd -39 -6d -d0 -13 -bc -c9 -29 -04 -fb -97 -5c -8e -6f -fc -b9 -82 -47 -c5 -20 -34 -e8 -cf -b2 -48 -5a -78 -e2 -bb -ea -11 -e8 -bf -1c -ea -22 -37 -da -98 -a4 -34 -47 -76 -fa -36 -51 -64 -e9 -7d -b8 -56 -f3 -94 -9e -c7 -bf -f1 -a7 -36 -53 -83 -22 -2a -f7 -fd -6f -15 -67 -21 -1c -57 -d6 -84 -c0 -ff -f4 -6c -2a -1b -7e -f9 -6b -38 -12 -28 -17 -92 -12 -92 -fa -f0 -20 -e6 -63 -d3 -23 -59 -d3 -79 -33 -9f -3c -f2 -fa -ed -a8 -07 -16 -3c -81 -7e -60 -ce -b1 -90 -38 -50 -d9 -5f -84 -86 -68 -f4 -99 -75 -91 -0d -62 -29 -6e -ef -ac -9f -7f -57 -92 -ad -0d -ef -98 -ab -b5 -2f -24 -3d -15 -c1 -a3 -75 -22 -8a -bc -5f -d8 -19 -d3 -e4 -88 -b5 -c7 -25 -4e -20 -f8 -53 -dd -05 -ec -30 -b7 -f7 -3c -0d -93 -13 -de -ee -cb -64 -68 -09 -13 -73 -ff -43 -98 -98 -80 -b1 -62 -e2 -8f -ed -b3 -c9 -c2 -35 -8d -98 -11 -e5 -b6 -f8 -0d -90 -ed -70 -b8 -34 -a0 -c6 -79 -83 -24 -8c -42 -b5 -3b -fd -1f -66 -eb -fd -1c -9b -50 -b9 -fa -6a -e6 -23 -30 -98 -72 -ef -b1 -15 -f4 -4d -4d -f7 -6c -1e -74 -79 -b0 -d6 -fe -fc -e0 -7b -fb -c5 -29 -0c -fe -18 -0f -2d -56 -9e -4a -54 -6b -1d -d5 -d1 -2c -33 -d9 -e1 -12 -46 -12 -45 -52 -17 -80 -a7 -0d -89 -33 -78 -2c -48 -14 -3b -e2 -3d -0c -64 -93 -e3 -0c -06 -07 -d5 -27 -17 -aa -ee -e5 -9d -85 -61 -e2 -bc -ee -09 -d9 -99 -2d -fe -91 -64 -6c -44 -a8 -3a -46 -04 -b6 -7c -17 -3a -ea -2f -19 -8d -92 -00 -ad -2b -cc -85 -f3 -7d -d8 -82 -67 -23 -bb -97 -e7 -b9 -aa -4f -be -16 -7f -04 -4d -07 -0c -66 -99 -d0 -42 -c1 -ff -04 -66 -b4 -94 -8c -97 -99 -74 -73 -d6 -2e -b4 -e2 -46 -83 -81 -4f -0b -76 -e5 -4e -17 -7a -1f -97 -4d -97 -8d -55 -00 -f7 -dd -54 -82 -7f -5a -5b -bc -69 -f8 -66 -ef -49 -40 -ba -d1 -42 -94 -5a -fa -75 -bd -42 -b0 -3f -ba -a5 -40 -22 -c4 -98 -51 -07 -87 -0c -4a -26 -10 -44 -95 -1e -96 -2e -60 -48 -40 -f6 -dd -a8 -0b -f0 -13 -17 -e1 -5b -9e -8c -95 -48 -aa -9c -84 -fc -b0 -76 -4b -03 -3c -31 -32 -cd -d9 -7b -54 -b5 -c2 -d4 -0d -81 -55 -ce -b3 -b2 -c4 -34 -16 -a8 -52 -b2 -db -4d -ef -60 -2e -b4 -fe -5a -7c -20 -d8 -a7 -12 -60 -ef -f2 -41 -36 -37 -83 -18 -82 -dd -a0 -a3 -e0 -8a -59 -fe -74 -ab -33 -52 -3e -3b -58 -4b -d1 -b2 -42 -4e -9d -eb -c6 -39 -86 -35 -7f -2b -6d -cd -f4 -81 -e9 -68 -fb -10 -94 -2a -7d -06 -ab -8c -7f -54 -7d -14 -49 -5a -a4 -fe -81 -2c -d5 -e0 -85 -f9 -21 -dc -0d -f0 -b5 -bb -32 -54 -f2 -d0 -18 -8f -80 -f7 -5d -16 -58 -3d -d8 -a9 -51 -8c -9e -e9 -ca -d8 -c5 -57 -f4 -74 -9b -71 -9b -c6 -99 -32 -19 -60 -e2 -67 -3a -86 -e8 -8a -bf -da -a4 -96 -c7 -1a -1a -95 -f7 -35 -cf -a1 -c9 -9d -5c -cd -3a -ca -bb -66 -43 -61 -2c -5a -1e -8c -57 -af -cc -d8 -ad -7c -b6 -11 -46 -18 -cd -8f -38 -32 -ea -fc -09 -65 -04 -c2 -17 -cb -de -a3 -f5 -a0 -f6 -51 -8e -f5 -5e -43 -0b -db -e5 -9c -30 -fb -99 -16 -24 -10 -16 -e3 -08 -67 -a5 -e3 -cb -78 -4e -70 -14 -29 -47 -83 -42 -ae -15 -c9 -c6 -3a -5c -bb -8e -f8 -b9 -a5 -ce -5b -57 -77 -d9 -9a -fb -65 -27 -67 -18 -c3 -6d -34 -99 -c1 -89 -ba -e7 -11 -d7 -10 -83 -80 -06 -12 -bb -1c -03 -ef -ab -31 -3f -d6 -89 -9f -e0 -2d -6f -16 -a7 -ed -c0 -99 -df -ee -ed -ed -4c -2e -65 -bb -df -98 -ee -f2 -b2 -c6 -1c -2e -e0 -de -22 -30 -79 -fd -e2 -54 -c3 -08 -4e -c3 -b9 -04 -c3 -cc -81 -64 -6c -8b -26 -7e -49 -d1 -8e -a3 -3b -41 -79 -88 -4b -15 -eb -94 -ee -c9 -5b -8d -23 -31 -73 -28 -d5 -6a -6e -90 -20 -05 -57 -3b -0c -08 -33 -c2 -63 -9a -79 -48 -d4 -0d -a3 -c6 -be -64 -17 -4f -66 -25 -0e -6e -8a -94 -83 -1c -4a -2a -92 -07 -40 -39 -ea -14 -8a -da -52 -49 -ca -ae -5f -a0 -cc -4e -83 -3b -63 -a6 -33 -51 -8c -70 -ff -f8 -0c -48 -b1 -f4 -07 -53 -e5 -aa -c5 -66 -bc -f9 -7e -b7 -61 -1e -b5 -e8 -fc -a7 -c5 -1d -da -02 -87 -86 -8f -43 -80 -34 -91 -7a -96 -53 -c8 -58 -ad -6e -40 -f8 -29 -5d -2e -71 -af -e8 -91 -1a -ad -13 -a6 -57 -fc -c4 -48 -df -04 -71 -ee -45 -ef -33 -bc -5a -5b -42 -44 -17 -89 -ae -9d -2c -c9 -e2 -9a -d4 -af -bf -d6 -a3 -d6 -db -3e -23 -24 -b0 -16 -29 -52 -6b -18 -73 -b1 -2d -e5 -7f -7c -ee -7d -80 -63 -ef -30 -94 -70 -ce -58 -57 -07 -6f -ee -52 -f0 -1c -0d -5a -de -1e -50 -28 -16 -b4 -f3 -ee -e1 -d0 -f0 -e4 -01 -5e -5e -59 -5b -ef -41 -ea -2b -39 -96 -9b -fc -95 -75 -1c -fd -b0 -03 -1d -86 -0e -b6 -48 -bd -d4 -e8 -7a -00 -68 -e3 -34 -67 -2a -af -50 -10 -26 -59 -91 -1b -42 -42 -87 -f0 -e0 -2f -d9 -77 -9c -aa -52 -69 -bc -f6 -6d -e5 -bf -97 -6d -1d -4e -25 -83 -a0 -bb -e0 -41 -92 -83 -7c -89 -3e -e6 -38 -c1 -50 -66 -fb -24 -33 -72 -ca -1b -bc -1f -5a -62 -b8 -07 -40 -f5 -ed -3c -4e -3d -15 -b5 -d2 -ca -4f -2b -46 -ac -04 -f3 -f1 -7f -5c -9a -07 -ea -da -24 -7b -be -c8 -82 -97 -14 -d7 -e6 -5e -25 -3c -97 -e5 -eb -07 -df -14 -c1 -20 -ec -bf -ae -68 -a3 -f0 -65 -e4 -9d -bc -f2 -6e -72 -63 -09 -70 -a8 -53 -87 -89 -9c -4f -ec -4a -09 -2e -22 -4d -0f -0b -df -c2 -6f -1a -c9 -23 -c2 -e4 -3f -09 -b2 -12 -13 -3f -93 -17 -fe -05 -dc -c0 -c7 -0e -3b -ed -02 -9e -f7 -01 -f9 -00 -2b -11 -31 -64 -41 -f4 -10 -c2 -53 -4b -5b -1f -39 -83 -83 -02 -c6 -78 -f3 -01 -3c -b8 -f5 -93 -03 -27 -b8 -04 -f9 -0f -4c -e2 -bb -c8 -aa -49 -ce -24 -d1 -29 -c9 -13 -e4 -0e -e5 -9e -77 -b8 -8f -b8 -d8 -d8 -ff -cd -1c -16 -d4 -2b -d0 -95 -de -68 -bc -d7 -b7 -b0 -e2 -ff -9e -f5 -e1 -34 -d1 -12 -5a -f6 -99 -16 -a9 -04 -cd -78 -b2 -a5 -cc -a1 -c5 -3d -61 -a2 -16 -52 -02 -c3 -fc -6e -d2 -91 -dc -6c -89 -65 -79 -31 -4f -a3 -99 -6f -1a -49 -62 -1f -56 -12 -b1 -9f -1d -e0 -cc -2d -db -51 -7e -82 -8a -69 -97 -05 -1c -c1 -bc -f3 -74 -c6 -b9 -56 -19 -3f -c5 -d3 -dd -c6 -8a -64 -cb -71 -31 -6e -d1 -78 -ae -7f -49 -1d -9c -82 -53 -c1 -80 -28 -03 -60 -f9 -9e -50 -63 -1c -dd -0e -3f -f3 -62 -59 -69 -48 -02 -68 -42 -80 -a9 -bc -11 -79 -59 -08 -01 -88 -a4 -a3 -71 -8d -88 -9b -d3 -b3 -50 -e7 -08 -3a -4a -15 -d0 -2a -34 -44 -55 -95 -43 -ab -6c -f6 -03 -0a -47 -f9 -ed -63 -52 -71 -8b -27 -7b -72 -d0 -1a -20 -34 -fb -01 -cf -bd -55 -58 -78 -d5 -0f -5f -bd -0a -6a -ce -fb -68 -c4 -a5 -e4 -ce -47 -ce -2e -18 -06 -6d -3f -68 -3d -be -db -14 -73 -3e -0f -f6 -81 -bb -9c -b5 -29 -2a -7d -c4 -56 -c6 -6a -57 -fe -da -3f -64 -1b -1a -5b -3c -f2 -f7 -9d -0d -05 -fe -b8 -29 -08 -3d -13 -73 -5c -3f -e2 -be -6b -f4 -34 -eb -81 -71 -3d -77 -13 -a0 -36 -cc -3b -44 -db -1a -3b -25 -44 -25 -a0 -7a -c0 -26 -b5 -e2 -2e -d9 -62 -88 -70 -a4 -2d -5b -32 -57 -e0 -21 -04 -4a -66 -f6 -a9 -a2 -5a -df -55 -53 -42 -cb -cd -ad -e5 -4c -73 -a8 -61 -f7 -ce -7b -74 -46 -d8 -44 -f2 -d5 -35 -21 -0e -26 -ec -66 -57 -61 -a7 -3a -e9 -e9 -9c -10 -28 -9d -13 -16 -72 -33 -27 -9b -2b -be -d0 -33 -d4 -8d -3d -98 -10 -bb -3a -cd -8c -e8 -eb -43 -b9 -03 -a8 -d8 -13 -fc -43 -e2 -1c -0a -60 -ef -94 -b4 -14 -0b -ac -ee -35 -7f -33 -e5 -9c -d3 -48 -c3 -bc -7a -da -be -84 -02 -26 -0b -57 -27 -a4 -11 -73 -35 -ed -31 -51 -b9 -1e -2a -a0 -ba -87 -b3 -74 -56 -21 -3a -af -f0 -33 -78 -7a -50 -da -73 -ec -27 -42 -ac -9b -70 -17 -57 -53 -bb -ee -bb -d8 -78 -5d -2b -3d -ad -15 -ae -12 -eb -08 -33 -45 -0a -f3 -38 -24 -0b -c5 -a4 -bf -b6 -75 -1c -eb -5f -0c -be -45 -59 -9f -7d -47 -34 -40 -0e -ec -9f -dc -16 -b2 -ee -38 -5c -52 -5e -ba -4f -d5 -37 -dc -f3 -75 -0b -d5 -be -ba -6c -e8 -9d -f7 -c9 -43 -3c -3a -ad -ee -db -6f -78 -d1 -c9 -fe -39 -a1 -23 -d7 -88 -e9 -9c -22 -0a -7e -f3 -66 -e6 -8d -4c -01 -86 -d2 -f5 -57 -b0 -c6 -7c -a0 -9a -8c -a8 -e8 -3b -de -6c -d7 -3b -18 -9f -f6 -75 -81 -a3 -68 -27 -cc -a7 -6e -75 -c6 -e8 -1a -1b -64 -93 -b0 -de -18 -45 -9f -e4 -57 -18 -34 -16 -f1 -6b -cb -cb -e9 -3c -65 -58 -01 -a9 -24 -c8 -d1 -98 -cb -89 -b9 -ac -43 -69 -f7 -55 -4f -e1 -18 -4d -6c -04 -36 -6a -0f -06 -4e -b7 -6e -1c -14 -af -b3 -2f -f0 -9d -e2 -50 -3b -33 -75 -8b -0c -18 -56 -ba -01 -37 -52 -3c -74 -62 -21 -86 -65 -b6 -10 -7b -5b -69 -4f -b3 -a6 -0f -e1 -fc -a3 -3d -2f -38 -ea -f2 -e3 -5c -d4 -04 -1e -c3 -00 -5f -1d -99 -41 -35 -99 -64 -de -ee -bf -84 -91 -27 -96 -a4 -24 -e3 -36 -62 -cb -7f -12 -ee -dc -ea -73 -17 -34 -75 -c4 -63 -d6 -8d -66 -7c -74 -1e -29 -fe -12 -c0 -44 -0d -77 -58 -d1 -34 -52 -4f -01 -2c -d9 -12 -01 -e7 -35 -35 -6c -e3 -8e -e2 -19 -08 -27 -2a -1e -7a -11 -5f -7f -5e -bf -63 -ac -d2 -89 -82 -5a -d2 -30 -50 -5a -42 -a5 -7d -3a -4f -01 -48 -70 -34 -cf -f8 -39 -6b -14 -a4 -73 -b5 -26 -68 -46 -bb -04 -65 -3a -cc -9d -e2 -20 -98 -e4 -ec -0a -16 -c7 -6d -33 -7a -1a -97 -56 -27 -51 -f1 -bd -b6 -65 +8f +ab f1 -46 -48 -c0 -2b -73 -94 -b6 -6a -21 -5e -4a -d0 -1d -29 -8c -79 -f0 -a5 -11 -14 -d7 -da -b2 -ca -6f -b5 -03 -37 -07 -ce -6d -0c -c6 -e4 -c1 -34 -9d -df -56 -cc -6b -73 -0a -26 -a6 -6c -48 -23 -58 -6b -c6 -31 -97 -b0 -23 -6d -af -34 -8d -a7 -bc -ce -20 -af -06 -73 -cd -46 -4f -b8 -ec -81 -7d -6b -55 -87 -b8 -0e -f5 -b4 -42 -93 -af -53 -b5 -6a -fd -72 -f0 -5d -d5 -d8 -f2 -6e -bf -3c -2f -da -eb -53 -77 -0d -eb +00 3c -d2 -c0 -3e -9c -3a -a9 -5e -48 -49 -e1 -a3 -89 -a4 -1b -90 -3e -d4 -47 -8c -a2 -a1 -41 -e8 -de -9c -da -e8 -ab -db -9b -15 -05 -be -e2 -4d -8e -60 -b3 -3a -37 -bb +ae +c6 +03 +78 +5c 8d -9d -dd -67 -1e -04 -2c -20 -0e -21 -ce -13 -80 -6d +07 +e0 +71 +35 1e -0b -f9 -69 -40 -9e -ce -03 -9b -22 -77 -91 -df -29 -20 -be -a4 -d5 -b6 -6a -61 -92 -c2 -58 -77 -39 -a3 -9b -e9 -f8 -6e -6c +aa +55 +00 00 -a4 -6f -a4 -14 -ed -b6 -10 -52 -c8 -46 -79 -b4 -1a -8b -5a aa 55 40 @@ -5461,9 +37,9 @@ 40 05 00 -33 +73 07 -20 +a0 00 00 00 @@ -5472,12 +48,12 @@ 00 00 00 -53 +d7 18 bc f2 7d -60 +68 01 00 00 @@ -5495,7 +71,7 @@ 00 10 04 -60 +70 00 00 06 @@ -5509,7 +85,7 @@ 00 00 00 -41 +45 a4 00 00 @@ -5759,26 +335,7 @@ 00 81 46 -33 -aa -55 -06 -00 -2d -46 -dc -05 -84 -03 -e8 -03 -aa -55 -01 -00 -35 -46 -04 +34 aa 55 01 @@ -5877,8 +434,8 @@ 00 43 47 -ee -4d +d0 +52 00 80 bb @@ -6353,8 +910,8 @@ 48 03 04 -01 02 +01 20 2a 3f @@ -6468,7 +1025,7 @@ 4a 09 a5 -26 +46 34 19 04 @@ -6668,19 +1225,7 @@ 00 08 44 -09 -aa -55 -06 00 -2d -46 -a4 -01 -18 -01 -2c -01 aa 55 01 @@ -6842,8 +1387,8 @@ aa aa 55 -43 -79 -1e -ca +f5 +72 +bd +17 20 Index: output/sched.rom =================================================================== --- /1121s/branch/mouse/YJX_Project/mouse_public_yjx/output/sched.rom (revision 1999) +++ /1121s/branch/mouse/YJX_Project/mouse_public_yjx/output/sched.rom (working copy) @@ -1,9 +1,9 @@ mem_patch00: 05 #mem_patch00 00 #mem_patch01 -33 #mem_patch02 +73 #mem_patch02 07 #mem_patch03 -20 #mem_patch04 +a0 #mem_patch04 00 #mem_patch05 00 #mem_patch06 00 #mem_patch07 @@ -12,12 +12,12 @@ 00 #mem_patch0a 00 #mem_patch0b 00 #mem_patch0c -53 #mem_patch0d +d7 #mem_patch0d 18 #mem_patch0e bc #mem_patch0f f2 #mem_patch10 7d #mem_patch11 -60 #mem_patch12 +68 #mem_patch12 01 #mem_patch13 00 #mem_patch14 00 #mem_patch15 @@ -35,7 +35,7 @@ 00 #mem_patch21 10 #mem_patch22 04 #mem_patch23 -60 #mem_patch24 +70 #mem_patch24 00 #mem_patch25 00 #mem_patch26 06 #mem_patch27 @@ -49,7 +49,7 @@ 00 #mem_patch2f 00 #mem_patch30 00 #mem_patch31 -41 #mem_patch32 +45 #mem_patch32 a4 #mem_patch33 00 #mem_patch34 00 #mem_patch35 @@ -235,27 +235,9 @@ 34 #ff ff ff ff ff ff #eeprom need mem_device3_type: -33 +34 #ff ff ff ff ff ff #eeprom need -#adc -mem_mouse_vdd_full_vol:dc 05 #1.5V -84 03#mem_mouse_vdd_empty_vol :0.9V -e8 03#mem_mouse_vdd_low_vol :1.0V -#mem_mouse_vdd_full_vol:e4 0c #3.3V -#b8 0b#mem_mouse_vdd_empty_vol :3.0V -#80 0c#mem_mouse_vdd_low_vol :3.2V - -mem_adc_channel_gpio:04 -#04 -#02 -#01 -#03 -#00 -#05 -#06 -#07 - #bit0:mouse_key_l bit1:mouse_key_r bit2:mouse_key_m mem_mouse_commbination_key_24g:03 mem_mouse_commbination_key_bt:07 @@ -273,7 +255,7 @@ mem_mouse_sleep_deal_type:00 #00:old version 01 new version mem_24g_rx_window:c0 12 #400us ## e0 2e#1ms #transmitter long range min:520us -mem_mouse_24g_short_sleep_set_4ms:ee 4d 00 #1662us +mem_mouse_24g_short_sleep_set_4ms:d0 52 00#f0 55 00 mem_mouse_24g_long_sleep_set_4ms:80 bb 00 mem_mouse_24g_fast_hop_count_4ms:05 mem_mouse_24g_tsniff_4ms:80 bb 00 00 @@ -396,8 +378,9 @@ mem_mouse_dpi_seting: 03 #mem_320x_dpi_0 1200 04 #mem_320x_dpi_1 1600 -01 #mem_320x_dpi_2 800 -02 #mem_320x_dpi_3 1000 +02 #mem_320x_dpi_2 1000 +01 #mem_320x_dpi_3 800 + 20 #mem_3212_dpi_0 2a #mem_3212_dpi_1 @@ -474,7 +457,7 @@ mem_sensor_ka8g2_init_new: 09 a5 -26 34 +46 34 19 04 60 07 69 04 @@ -578,7 +561,7 @@ #01 ADC_CONFIG_HVIN #02 ADC_CONFIG_GPIO mem_adc_clkdiv:0a -mem_adc_channel:09 +mem_adc_channel:00 #00 ADC_CH_VBAT #01 ADC_CH_VDCDC5V #06 ADC_CH_GPIO18 @@ -591,9 +574,21 @@ #0d ADC_CH_GPIO22 #0e ADC_CH_GPIO13 -mem_mouse_vdd_full_vol:a4 01 #4.2V -18 01#mem_mouse_vdd_empty_vol :2.8V -2c 01#mem_mouse_vdd_low_vol :3.0V +#adc +#mem_mouse_vdd_full_vol:4a 01 #3.3V +#2c 01#mem_mouse_vdd_empty_vol :3.0V +#40 01#mem_mouse_vdd_low_vol :3.2V + +#mem_adc_channel_gpio:04 +#04 +#02 +#01 +#03 +#00 +#05 +#06 +#07 + # rf debug #bit7:0 means disable rf debug function Index: program/app_mouse.prog =================================================================== --- /1121s/branch/mouse/YJX_Project/mouse_public_yjx/program/app_mouse.prog (revision 1999) +++ /1121s/branch/mouse/YJX_Project/mouse_public_yjx/program/app_mouse.prog (working copy) @@ -1085,6 +1085,7 @@ bpatch patch0f_3,mem_patch0f call mouse_dpi_ghost_check rtn user +mouse_dpi_process_next: fetch 1,mem_mouse_dpi copy pdata,temp @@ -3881,9 +3882,9 @@ bpatch patch12_0,mem_patch12 fetch MOUSE_FLAG_LEN,mem_mouse_flag rtnbit0 MOUSE_ENABLE_SELECT_DEVICE_BY_SWITCH_GPIO -mouse_switch_gpio_connect_gnd: fetcht 1,mem_device_switch_gpio call mouse_gpio_config_input_pu +mouse_switch_gpio_connect_gnd: fetcht 1,mem_device_switch_gpio call gpio_get_bit branch mouse_check_select_24g_device,true @@ -4450,6 +4451,7 @@ setarg 0 store 2,mem_24g_reconn_timeout call mouse_stop_discovery +mouse_24g_pair_mode_check: jam TYPE_MS,mem_24g_data_type fetch MOUSE_FLAG_LEN,mem_mouse_flag bbit0 MOUSE_ENABLE_KEYBOARD,g24_pair_start @@ -4681,6 +4683,7 @@ call timer_check nrtn blank call mouse_dpi_check_once +mouse_g24_retransmit_event_set: call mouse_dpi_key_check_long_press mouse_g24_retransmit_100ms_timer_init: arg 12,queue Index: program/bt.prog =================================================================== --- /1121s/branch/mouse/YJX_Project/mouse_public_yjx/program/bt.prog (revision 1999) +++ /1121s/branch/mouse/YJX_Project/mouse_public_yjx/program/bt.prog (working copy) @@ -19,7 +19,7 @@ //define COMPILE_WECHAT //define COMPLIE_TEST define COMPLIE_ADPCM - +define YC1121SB INCLUDE "bt_format" org 0x0000 // start from patch ram address start @@ -1275,7 +1275,11 @@ set0 gpio_latch,pdata // enable gpio normal function after load gpio configuration store 1,core_lpm_isogate nbranch boot_load,wake // wakeup from hibernate +ifdef YC1121SB + nop 1 +else call clean_smem +endif storer alarm,4,mem_saved_gpio_in rtn Index: program/patch.prog =================================================================== --- /1121s/branch/mouse/YJX_Project/mouse_public_yjx/program/patch.prog (revision 1999) +++ /1121s/branch/mouse/YJX_Project/mouse_public_yjx/program/patch.prog (working copy) @@ -15,16 +15,23 @@ beq patch02_1,p_set_sync_on beq patch02_4,p_set_lemode beq patch02_5,p_rf_rx_enable + beq patch02_6,p_calc_freq beq patch03_0,p_txon beq patch03_1,p_set_tx_power beq patch03_2,p_initialize_radio_cont beq patch04_5,p_lpm_sleep + beq patch04_7,p_lpm_adjust_clk beq patch0d_0,p_mouse_cb_fuction beq patch0d_1,p_mouse_load_device_info_check + beq patch0d_2,p_mouse_default_init beq patch0d_4,p_mouse_param_init beq patch0d_6,p_mouse_start_work + beq patch0d_7,mouse4_0_check_reconn_target beq patch0e_3,p_mouse_setgpio_hibernate beq patch0e_4,p_mouse_lpm_before_common +ifdef ADC_1121SB + beq patch0e_7,p_mouse_adc_read_start +endif beq patch0f_2,p_mouse_motion beq patch0f_3,p_mouse_dpi_process beq patch0f_4,p_mouse_setting_dpi @@ -42,6 +49,7 @@ beq patch11_5,p_mouse_store_dpi_info_check beq patch11_6,p_mouse_idle // beq patch12_0,p_mouse_check_select_device_by_switch + beq patch12_3,p_mouse_drawing_optima beq patch12_5,p_mouse_24g_hibernate_set beq patch12_6,p_mouse_24g_package_data beq patch13_0,p_mouse_dpi_led_blink_init @@ -59,7 +67,8 @@ pf_patch_ext: beq patch22_4,p_le_slave_match - beq patch23_2,p_le_got_first_packet + beq patch23_2,p_le_got_first_packet_new //p_le_got_first_packet + beq patch24_4,p_le_receive_rxon beq patch24_5,p_le_rx_dec beq patch24_6,p_le_rx_nopayload beq patch27_1,p_le_parse @@ -67,6 +76,7 @@ beq patch29_4,p_le_adv_not_match beq patch29_5,p_le_init_adv beq patch32_0,p_g24_reconn_dispatch + beq patch32_2,p_g24_reconn_device_fail beq patch32_6,p_g24_short_sleep beq patch33_2,p_mouse_g24_retransmit beq patch33_5,p_g24_transmit_hop_process @@ -111,6 +121,21 @@ jam 0xdd,0x8a23 rtn +p_calc_freq: + setarg 2400 + iadd temp,pdata + copy pdata, rega + fetcht 1,mem_fcomp_div + rshift temp,temp + idiv temp +// mul32 pdata,12,rega + call wait_div_end + quotient pdata + rshift8 pdata,queue + storer queue, 1,0x890a + store 1,0x8909 + branch calc_freq+10 + p_initialize_radio_cont: jam 0,mem_le_testtype jam 0,mem_cmd_le_create_conn @@ -156,14 +181,43 @@ call p_rfpll_aac_ghpc call p_set_xtal_cap jam SYSTEM_CLK_12M,mem_system_clk - branch sadc_calibration +p_sadc_calibration: + rtn wake + jam 0x77,core_gpadc_ctrl + jam 0xc9,core_gpadc_cfg0 + jam 0x01,core_gpadc_cfg3 + fetch 1,mem_adc_clkdiv + store 1,core_sadc_clkdiv + nop 3000 + call p_sadc_read + jam 0xc1,core_gpadc_cfg0 + fetchr regb,1,mem_spi_write_addr + arg 8,loopcnt //rg_gpadc_sar_dat_sel c0-c7 + call sadc_cal_read+1 + fetch 1,mem_spi_write_addr + store 1,mem_adc_cal_c7 + storer regb,1,mem_spi_write_addr + rtn + +p_sadc_read: + jam 0x03,core_sadc_ctrl +p_sadc_read_wait: + fetch 1,core_perf_status + bbit0 SARADC_DONE,p_sadc_read_wait + fetcht 2,core_sadc_data + storet 2,mem_adc_current_value + jam 0x00,core_sadc_ctrl + rtn p_set_xtal_cap: +ifndef XTAL_CALP_SET rtn wake +endif until null,lpo_edge fetch 1,mem_xtal_c_sel +p_set_xtal_cap_next: store 1,core_xtal_cap - branch p_mouse_wait_lpo + branch lpm_write_wait p_dpll_on: fetch 1,mem_fcomp_div @@ -267,13 +321,21 @@ fetch 1,mem_mouse_need_soft_reset nrtn blank call p_mouse_retransmit_select_device_by_pb_button - branch mouse_g24_retransmit+3 + call p_mouse_select_device_by_dpi_button_once + branch g24_retransmit0 p_mouse_retransmit_select_device_by_pb_button: fetch 1,mem_config_select_device_button_gpio rtneq GPIO_DISABLE branch mouse_retransmit_select_device_by_pb_button +p_mouse_select_device_by_dpi_button_once: + arg 12,queue + call timer_check + nrtn blank + call p_mouse_dpi_check_retransmit + branch mouse_g24_retransmit_event_set + p_g24_transmit_hop_process: fetcht 1,mem_24g_retry fetch 1,mem_24g_fast_hop_count // 125Hz=11 250Hz=5 @@ -305,31 +367,23 @@ p_set_tx_power: fetch 1,mem_tx_power beq TX_POWER_6DB,set_tx_power_7db - beq TX_POWER_10DB,p_set_tx_power_10db beq TX_POWER_F30DB,p_set_tx_power_f30db //beq TX_POWER_F35DB,p_set_tx_power_f35db //beq TX_POWER_F40DB,p_set_tx_power_f40db beq TX_POWER_FACTORY,p_set_tx_power_factory branch set_tx_power+2 - -p_set_tx_power_10db: - jam 0x25,0x8a14 - setarg 0xa93f3f - store 3,0x8a60 - jam 0x1f,0x8a63 - rtn p_set_tx_power_factory: jam 0x17,0x8a14 fetch 3,mem_tx_power_factory_param_new +p_mouse_tx_power_set: store 3,0x8a60 branch set_tx_power_8a63_28 p_set_tx_power_f30db: jam 0x17,0x8a14 setarg 0x250300 - store 3,0x8a60 - branch set_tx_power_8a63_28 + branch p_mouse_tx_power_set /* p_set_tx_power_f35db: jam 0x17,0x8a14 @@ -431,36 +485,6 @@ rtn wake branch rfpll_aac_ghpc+1 -p_sadc_calibration: - rtn wake - jam 0x77,core_gpadc_ctrl - jam 0xc9,core_gpadc_cfg0 - jam 0x01,core_gpadc_cfg3 - fetch 1,mem_adc_clkdiv - store 1,core_sadc_clkdiv - nop 3000 - call p_sadc_read - jam 0xc1,core_gpadc_cfg0 - fetchr regb,1,mem_spi_write_addr - arg 8,loopcnt //rg_gpadc_sar_dat_sel c0-c7 - call sadc_cal_read+1 - fetch 1,mem_spi_write_addr - store 1,mem_adc_cal_c7 - storer regb,1,mem_spi_write_addr - rtn - - -p_sadc_read: - jam 0x03,core_sadc_ctrl -p_sadc_read_wait: - fetch 1,core_perf_status - bbit0 SARADC_DONE,p_sadc_read_wait - fetcht 2,core_sadc_data - storet 2,mem_adc_current_value - jam 0x00,core_sadc_ctrl - rtn - - p_set_lemode: jam 0x11,0x8a82 jam 0x12,0x8a8d @@ -501,8 +525,7 @@ arg 256,regc iadd regc,pdata rtn -p_le_got_first_packet: - branch p_le_got_first_packet_new + p_le_slave_match: call p_le_check_retransmit branch le_slave_match+1 @@ -546,15 +569,7 @@ fetch 1,mem_le_conn_rcv_new //lpm use retention mem increase 1,pdata store 1,mem_le_conn_rcv_new - fetch 1,mem_le_state - rtnbit1 lestate_got_first_packet - set1 lestate_got_first_packet,pdata - store 1,mem_le_state - fetch 2,mem_le_init_superto - store 2,mem_le_superto - setarg 0 - store 4,mem_le_transmit_window - rtn + branch le_got_first_packet+4 p_le_rx_dec: call le_check_retransmit @@ -593,6 +608,65 @@ set0 mark_ble_crc_fail,mark branch le_init_adv+1 +p_le_receive_rxon: + call le_prep + bmark0 mark_ble_lr,p_le_receive_nolr + pulse dewhiten_code_calc + nop 30 + call le_prep + lshift3 timeup,timeup +p_le_receive_nolr: + disable match + enable decode_fec0 + enable is_rx + disable is_tx + copy timeup,stop_watch + correlate null,timeout + branch p_le_receive_on_attempt,attempt + copy clke,temp + storet 6,mem_sync_clke +p_le_receive_on_attempt: + nbranch le_unsync_end,sync + enable swfine + fetch 1,mem_le_tx_ifs_defference + arg PARAM_20MS_INIT,temp + iadd temp,temp + fetch 1,mem_system_clk + imul32 temp,stop_watch + call rf_debug_rx_sync_line //L-H + branch le_receive_skip,attempt + call p_calc_clke_all_modem + fetch 1,mem_le_state + bbit0 lestate_got_first_packet,le_receive_skip + call lpm_adjust_clk,wake + branch le_receive_skip + +p_calc_clke_all_modem: + fetcht 6,mem_sync_clke + copy clke,pdata + call clk_diff + copy pdata,temp + + call calc_clke_all_modem + copy clke,rege + copy clke_rt,pdata + iadd temp,pdata + copy pdata,clke_rt + rtn + +p_lpm_adjust_clk: + bmark0 mark_context,lpm_clear_counter + fetcht 4,mem_sleep_counter_all + arg 0x600,pdata + isub temp,null + rtn positive // interval too small + copy temp,rega + fetcht 6,mem_sync_clke + deposit rege + call clk_diff_rt + copy rega,temp + branch lpm_adjust_clk+6 + p_le_adv_not_match: call shutdown_radio jam 0,0x8900 @@ -704,17 +778,15 @@ setarg 0x10 //bit0-1:key_delay bit2-3:pu_delay bit4-6:interval bit7:enable p_mouse_puchk_set: store 1,core_puwakeup -p_mouse_wait_lpo: - until null,lpo_edge - rtn - -p_mouse_puchk_enable: - setarg 0x80 //bit0-1:key_delay bit2-3:pu_delay bit4-6:interval bit7:enable - branch p_mouse_puchk_set + branch lpm_write_wait p_mouse_lpm_before_common: call p_clear_wake jam 0,mem_mouse_qdec_set_flag + fetcht 1,mem_matrix_public_gpio // enable b4/b5/dpi wakeup + call gpio_out_active + fetcht 1,mem_matrix_public_gpio + call gpio_clr_wake call mouse_lpm_before_common+1 call mouse_gpio_pd_idle p_mouse_wheel_set_impedance: @@ -725,8 +797,12 @@ p_lpm_sleep: //call xtal_fast_wake - fetch 2,mem_cb_before_lpm_sleep - call callback_func +// fetch 2,mem_cb_before_lpm_sleep +// call callback_func +ifdef XTAL_CALP_SET + setarg 0x12 + call p_set_xtal_cap_next +endif p_lpm_sleep_skip_cb_function: fetch 4,mem_sleep_counter_all // sleep total time, 32k unit iadd temp,pdata @@ -738,7 +814,9 @@ p_mouse_puchk_set_check: fetch 1,mem_mouse_qdec_set_flag branch p_mouse_puchk_disable,blank - branch p_mouse_puchk_enable +p_mouse_puchk_enable: + setarg 0x80 //bit0-1:key_delay bit2-3:pu_delay bit4-6:interval bit7:enable + branch p_mouse_puchk_set p_lpm_save_context: storer mark,8,mem_saved_mark @@ -801,25 +879,32 @@ p_g24_reconn_mode_judge: fetch MOUSE_FLAG_LEN,mem_mouse_flag - bbit1 MOUSE_ENABLE_AUTO_24G_PARING,g24_pair_start + bbit1 MOUSE_ENABLE_AUTO_24G_PARING,mouse_24g_pair_mode_check branch g24_reconn_receiver_addr +p_g24_reconn_device_fail: + fetch 1,mem_24g_fast_conn_enable + branch g24_ch,blank + fetch 2,mem_24g_reconn_count + increase 1,pdata + store 2,mem_24g_reconn_count + isolate1 9,pdata + fetch 1,mem_24g_reconn_type + beq PAIR_AND_RECEIVER,p_g24_reconn_pair_and_receiver + branch g24_reconn_device_fail+7 + +p_g24_reconn_pair_and_receiver: + branch g24_reconn_receiver_addr,true + branch g24_pair_init_param + p_mouse_param_init: call mouse_param_common_init -// call p_mouse_le_buff_modify setarg mem_le_tx_buffer0_omemalloc_new store 2,mem_ble_l2cap_tx_buff0_ptr setarg MOUSE_BLE_L2CAP_TXBUFF_SIZE_NEW store 2,mem_ble_l2cap_tx_buff_size_ptr branch mouse_param_init+2 -//p_mouse_le_buff_modify: -// setarg mem_le_tx_buffer0_omemalloc_new -// store 2,mem_ble_l2cap_tx_buff0_ptr -// setarg MOUSE_BLE_L2CAP_TXBUFF_SIZE_NEW -// store 2,mem_ble_l2cap_tx_buff_size_ptr -// rtn - p_recv_addr_zero_skip: fetch 4,mem_24g_fast_conn_addr fetcht 4,mem_24g_addr @@ -914,8 +999,8 @@ store 2,mem_cb_24g_transmit_short_sleep setarg mouse_24g_long_sleep store 2,mem_cb_24g_transmit_long_sleep - setarg p_mouse_24g_before_lpm_sleep - store 2,mem_cb_before_lpm_sleep +// setarg p_mouse_24g_before_lpm_sleep +// store 2,mem_cb_before_lpm_sleep branch mouse_cb_fuction+7 p_soft_reset: @@ -928,17 +1013,25 @@ p_mouse_wheel_init_set: call p_mouse_puchk_disable - fetcht 1,mem_whee_a_data_gpio //reinit gpio pu after disable wheel wakeup - call gpio_config_input - fetcht 1,mem_whee_b_data_gpio - branch gpio_config_input + call mouse_matrix_public_gpio_reset + branch mouse_wheel_gpio_init +// fetcht 1,mem_whee_a_data_gpio //reinit gpio pu after disable wheel wakeup +// call gpio_config_input +// fetcht 1,mem_whee_b_data_gpio +// branch gpio_config_input -p_mouse_24g_before_lpm_sleep: - rtn + +//p_mouse_24g_before_lpm_sleep: +// rtn // fetch 1,mem_device_flag // rtnne MODE_24G_DEVICE // branch mouse_24g_before_lpm_sleep+2 +p_mouse_default_init: + fetch MOUSE_FLAG_LEN,mem_mouse_flag + isolate1 MOUSE_ENABLE_KEYBOARD,pdata + call mouse_customer_key_enable,true + branch mouse_default_parm_init ifdef SELECT_ANGLE p_mouse_select_angle: @@ -994,8 +1087,7 @@ call p_mouse_select_angle call p_mouse_set_sensor_gpio_sleep endif - fetch 1,mem_tx_power - store 1,mem_normal_tx_power + call p_mouse_store_normal_tx_power fetch MOUSE_FLAG_LEN,mem_mouse_flag bbit1 MOUSE_ENABLE_EEPROM,mouse_load_eeprom_info_check // bbit1 MOUSE_ENABLE_FLASH,mouse_load_flash_info_check @@ -1029,7 +1121,8 @@ p_mouse_read_otp_device_info: fetch MOUSE_FLAG_LEN,mem_mouse_flag - bbit1 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,mouse_read_otp_le_device1 + isolate1 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,pdata + call mouse_read_otp_le_device1,true branch mouse_read_otp_device_info p_mouse_app_initflag_check: @@ -1040,16 +1133,15 @@ // call mouse_app_initflag_check_next storet 2,mem_store_flag call mouse_ble_init_address - fetch 1,mem_device_flag_temp - store 1,mem_device_flag +// fetch 1,mem_device_flag_temp +// store 1,mem_device_flag call mouse_load_default_dpi setarg 0x1122 store 2,mem_random_addr_increase_count p_mouse_device_flag_temp_load: fetch 1,mem_mouse_device_flag_temp //reinit device flag - store 1,mem_device_flag - rtn + branch mouse_device_flag_load_end p_mouse_device_flag_check: fetch 1,mem_device_flag @@ -1309,13 +1401,13 @@ rtn p_mouse_le_addr2_init_check: - fetch 6,mem_device1_locall_addr + fetch 6,mem_device2_locall_addr fetcht 6,mem_mouse_compare_addr isub temp,null nrtn zero fetch 6,mem_le_lap add pdata,0x0100,pdata - store 6,mem_device1_locall_addr + store 6,mem_device2_locall_addr rtn p_mouse_buletooth_fast_conn_end: @@ -1336,8 +1428,6 @@ p_mouse_load_le_device1: fetch 6,mem_device1_addr store 6,mem_hci_plap -// arg mem_le_ltk,contw -// call memcpy16 fetch 6,mem_device1_locall_addr store 6,mem_le_lap rtn @@ -1345,8 +1435,6 @@ p_mouse_load_le_device2: fetch 6,mem_device2_addr store 6,mem_hci_plap -// arg mem_le_ltk,contw -// call memcpy16 fetch 6,mem_device2_locall_addr store 6,mem_le_lap rtn @@ -1407,7 +1495,9 @@ //bt call mouse_check_reconnect_delay_long_sleep //delete 3.0,reconnect fail call p_mouse_current_mult_update_timer - branch mouse_bb_event_timer_next + call mouse_wheel_trigger_timer + call mouse_store_information_delay_timer + branch mouse_check_no_data_timeout_timer p_mouse_le_send_conn_param_update_timer: arg mem_mouse_le_send_conn_param_update_timer,regc @@ -1483,7 +1573,7 @@ jam LE_LPM_ENABLE,mem_mouse_le_conn_param_reject jam 0,mem_mouse_clear_sensor_data_flag call le_clr_config_more_data - branch p_mouse_bb_disconnected +// branch p_mouse_bb_disconnected p_mouse_bb_disconnected: call mouse_bb_discon_clear_stack fetch APP_DISC_RSN_SIZE,mem_app_disconn_reason @@ -1516,28 +1606,43 @@ fetcht 4,mem_24g_fast_conn_addr isub temp,null rtn zero - call mouse_soft_agc_disable call p_mouse_fetch_normal_tx_power branch mouse_24g_first_store_reconn_info p_mouse_24g_pairing_complete: - call mouse_soft_agc_disable call p_mouse_fetch_normal_tx_power branch mouse_24g_pairing_complete +p_mouse_fetch_normal_tx_power: + fetch 1,mem_normal_tx_power + store 1,mem_tx_power + branch mouse_soft_agc_disable + p_mouse_24g_attempt_fail: - call mouse_soft_agc_disable call p_mouse_fetch_normal_tx_power fetch 1,mem_mouse_dpi_button_state rtneq DPI_BUTTON_STATE_DOWN fetch 1,mem_24g_attempt_fail_flag nbranch mouse_24g_hibernate_set,blank fetch 1,mem_24g_reconn_type - beq PAIR_AND_3_0_ADDR,p_mouse_24g_auto_pair_attempt_fail - beq FAST_CONN_AND_RECEIVER,mouse_24g_fast_conn_attempt_fail +// beq PAIR_AND_3_0_ADDR,p_mouse_24g_auto_pair_attempt_fail + beq PAIR_AND_RECEIVER,p_mouse_24g_auto_pair_attempt_fail + beq FAST_CONN_AND_RECEIVER,p_mouse_24g_fast_conn_attempt_fail beq RECEIVER_AND_3_0_ADDR,p_mouse_reconn_dongle_attempt_fail branch mouse_24g_attempt_fail+2 +p_mouse_24g_fast_conn_attempt_fail: + fetch MOUSE_FLAG_LEN,mem_mouse_flag + bbit1 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,p_mouse_24g_start_auto_pair + bbit1 MOUSE_ENABLE_AUTO_24G_PARING,p_mouse_24g_start_auto_pair + branch mouse_24g_fast_conn_attempt_fail+3 + +p_mouse_24g_start_auto_pair: + fetch 2,mem_24g_pair_timeout_init + store 2,mem_24g_reconn_timeout + jam PAIR_AND_RECEIVER,mem_24g_reconn_type + branch g24_reconn_start + p_mouse_24g_auto_pair_attempt_fail: fetch MOUSE_FLAG_LEN,mem_mouse_flag bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,mouse_24g_attempt_fail_enter_hibernate @@ -1553,8 +1658,8 @@ bbit0 MOUSE_ENABLE_24G_FIRST_AUTO_PAIRING,mouse_24g_attempt_fail_enter_hibernate bbit1 MOUSE_ENABLE_EEPROM,mouse_24g_attempt_fail_enter_hibernate bbit1 MOUSE_ENABLE_OTP,mouse_24g_attempt_fail_enter_hibernate -// bbit1 MOUSE_ENABLE_FLASH,mouse_24g_attempt_fail_enter_hibernate - branch mouse_24g_start_auto_pair + bbit1 MOUSE_ENABLE_FLASH,mouse_24g_attempt_fail_enter_hibernate + branch p_mouse_24g_start_auto_pair p_mouse_start_work: fetch MOUSE_FLAG_LEN,mem_mouse_flag @@ -1566,7 +1671,12 @@ p_mouse_24g_first_start_auto_pair_mode: call mouse_wakeup_from_power_check branch p_mouse_24g_first_start_reconn,user - branch mouse_24g_reconn_general_dongle +p_mouse_24g_reconn_general_dongle: + jam MODE_24G_DEVICE,mem_device_flag + fetch 2,mem_mouse_24g_power_on_fast_conn_timer + store 2,mem_24g_reconn_timeout + jam FAST_CONN_AND_RECEIVER,mem_24g_reconn_type + branch g24_reconn_start p_mouse_24g_first_start_reconn: fetch 1,mem_device_flag @@ -1583,17 +1693,10 @@ fetch MOUSE_FLAG_LEN,mem_mouse_flag bbit1 MOUSE_ENABLE_AUTO_24G_PARING,p_mouse_24g_reconn_general_dongle branch mouse_24g_start_mode+7 - -p_mouse_24g_reconn_general_dongle: - jam MODE_24G_DEVICE,mem_device_flag - fetch 2,mem_mouse_24g_power_on_fast_conn_timer - store 2,mem_24g_reconn_timeout - jam FAST_CONN_AND_RECEIVER,mem_24g_reconn_type - branch g24_reconn_start -p_mouse_fetch_normal_tx_power: - fetch 1,mem_normal_tx_power - store 1,mem_tx_power +p_mouse_store_normal_tx_power: + fetch 1,mem_tx_power + store 1,mem_normal_tx_power rtn p_mouse_idle: @@ -1613,6 +1716,9 @@ setarg 32 branch timer_init +p_mouse_dpi_check_retransmit: + fetch MOUSE_FLAG_LEN,mem_mouse_flag + rtnbit0 MOUSE_ENABLE_SELECT_DEVICE_BY_DPI_BUTTON p_mouse_dpi_check: fetch 1,mem_dpi_button_gpio rtneq GPIO_DISABLE @@ -1672,9 +1778,7 @@ p_clear_wake: setarg 0 - set1 21,pdata store 8,mem_gpio_wakeup_cfg //gpio5(ice)enable wake - setarg 0 store 4,mem_gpio_wakeup_cfg+8 rtn @@ -1694,10 +1798,6 @@ call mouse_set_sdio_high call p_clear_wake call mouse_before_hibernate_wheel_gpio_set - fetcht 1,mem_matrix_public_gpio // enable b4/b5/dpi wakeup - call gpio_out_active - fetcht 1,mem_matrix_public_gpio - call gpio_clr_wake fetch 1,mem_mouse_sensor_sdio_gpio call mouse_gpio_config_output_high @@ -1707,9 +1807,7 @@ call mouse_gpio_config_input_pu call mouse_logo_led_off - call mouse_lpm_before_common - call mouse_gpio_pd_idle - call p_mouse_wheel_set_impedance + call p_mouse_lpm_before_common // fetcht 1,mem_mouse_reuse_2ice_gpio // call mouse_gpio_config_input_pu // call p_mouse_gpio_set_high_impedance @@ -1773,9 +1871,9 @@ rtnbit0 MOUSE_ENABLE_SELECT_DEVICE_BY_SWITCH_GPIO bbit0 MOUSE_ENABLE_SWITCH_GPIO_CONNECT_VIN,p_mouse_switch_gpio_connect_gnd p_mouse_switch_gpio_connect_vin_check: - fetcht 1,mem_device_switch_gpio - call gpio_out_active + call p_mouse_switch_gpio_pd_set call p_mouse_switch_gpio_connect_vin +p_mouse_switch_gpio_pu_set: fetcht 1,mem_device_switch_gpio call gpio_out_inactive fetcht 1,mem_device_switch_gpio @@ -1783,15 +1881,12 @@ p_mouse_switch_gpio_connect_vin: fetcht 1,mem_device_switch_gpio - call mouse_gpio_config_input_pd - fetcht 1,mem_device_switch_gpio call gpio_get_bit nbranch mouse_check_select_24g_device,true branch mouse_select_btdevice p_mouse_switch_gpio_connect_gnd: - fetcht 1,mem_device_switch_gpio - call gpio_out_inactive + call p_mouse_switch_gpio_pu_set call mouse_switch_gpio_connect_gnd fetcht 1,mem_device_switch_gpio call gpio_out_active @@ -2041,6 +2136,11 @@ call p_mouse_key branch mouse_motion+11 +p_mouse_drawing_optima: + fetch 1,mem_config_sensor_type + rtneq KA8G2 + branch mouse_drawing_optima+1 + p_mouse_key: call mouse_check_firekey_gpio fetch 1,mem_fire_key_flag @@ -2052,25 +2152,82 @@ call p_mouse_ghost_key_check branch mouse_key+7 -p_mouse_ghost_key_check: //mfw rbk +p_mouse_ghost_key_check: //lbk_mfw jam 0,mem_mouse_matrix_key_cow_count jam 0,mem_mouse_matrix_key_row_count jam 0,mem_mouse_ghost_flag copy pdata,regb + fetcht 1,mem_lbutton_gpio + fetch 1,mem_bk_button_gpio + isub temp,null + branch p_mouse_matrix_ghost_key_L_BK,zero + fetch 1,mem_fw_button_gpio + isub temp,null + branch p_mouse_matrix_ghost_key_L_FW,zero + fetcht 1,mem_mbutton_gpio + fetch 1,mem_bk_button_gpio + isub temp,null + branch p_mouse_ghost_key_MBK_RFW,zero p_mouse_ghost_key_MFW_RBK: call mouse_ghost_key_check_M_FW p_mouse_ghost_key_RBK: call p_mouse_ghost_key_check_R_BK branch mouse_ghost_key_check_next +p_mouse_matrix_ghost_key_L_BK: + fetcht 1,mem_mbutton_gpio + fetch 1,mem_fw_button_gpio + isub temp,null + branch mouse_ghost_key_LBK_MFW,zero +p_mouse_ghost_key_LBK_RFW: + call mouse_ghost_key_check_L_BK + branch p_mouse_ghost_key_RFW + +p_mouse_matrix_ghost_key_L_FW: + fetcht 1,mem_mbutton_gpio + fetch 1,mem_bk_button_gpio + isub temp,null + branch p_mouse_ghost_key_LFW_MBK,zero +p_mouse_ghost_key_LFW_RBK: + call p_mouse_ghost_key_check_L_FW + branch p_mouse_ghost_key_RBK + +p_mouse_ghost_key_LFW_MBK: + call p_mouse_ghost_key_check_L_FW + call p_mouse_ghost_key_check_M_BK + branch mouse_ghost_key_check_next + +p_mouse_ghost_key_MBK_RFW: + call p_mouse_ghost_key_check_M_BK +p_mouse_ghost_key_RFW: + call p_mouse_ghost_key_check_R_FW + branch mouse_ghost_key_check_next + +p_mouse_ghost_key_check_M_BK: + and regb,MOUSE_M_BK_BUTTON,pdata + branch mouse_ghost_key_check_M_BK+1 + p_mouse_ghost_key_check_R_BK: and regb,MOUSE_R_BK_BUTTON,pdata branch mouse_ghost_key_check_R_BK+1 -// beq MOUSE_R_BK_BUTTON,mouse_matrix_cow_more_than_one_key -// rtn -endif + +p_mouse_ghost_key_check_L_FW: + and regb,MOUSE_L_FW_BUTTON,pdata + branch mouse_ghost_key_check_L_FW+1 + +p_mouse_ghost_key_check_R_FW: + and regb,MOUSE_R_FW_BUTTON,pdata + branch mouse_ghost_key_check_R_FW+1 ifdef ADC_1121SB +p_mouse_adc_read_start: + call enable_adc + call vdd_calculate_by_mode + div pdata,10 + call get_div_result + store 2,mem_mouse_vdd_now_vol + branch mouse_adc_data_process + p_adc_init_data: fetch 8,mem_otp_adc branch adc_init_cal_data_default,blank Index: sched/mouse.dat =================================================================== --- /1121s/branch/mouse/YJX_Project/mouse_public_yjx/sched/mouse.dat (revision 1999) +++ /1121s/branch/mouse/YJX_Project/mouse_public_yjx/sched/mouse.dat (working copy) @@ -168,27 +168,9 @@ 34 #ff ff ff ff ff ff #eeprom need mem_device3_type: -33 +34 #ff ff ff ff ff ff #eeprom need -#adc -mem_mouse_vdd_full_vol:dc 05 #1.5V -84 03#mem_mouse_vdd_empty_vol :0.9V -e8 03#mem_mouse_vdd_low_vol :1.0V -#mem_mouse_vdd_full_vol:e4 0c #3.3V -#b8 0b#mem_mouse_vdd_empty_vol :3.0V -#80 0c#mem_mouse_vdd_low_vol :3.2V - -mem_adc_channel_gpio:04 -#04 -#02 -#01 -#03 -#00 -#05 -#06 -#07 - #bit0:mouse_key_l bit1:mouse_key_r bit2:mouse_key_m mem_mouse_commbination_key_24g:03 mem_mouse_commbination_key_bt:07 @@ -206,7 +188,7 @@ mem_mouse_sleep_deal_type:00 #00:old version 01 new version mem_24g_rx_window:c0 12 #400us ## e0 2e#1ms #transmitter long range min:520us -mem_mouse_24g_short_sleep_set_4ms:ee 4d 00 #1662us +mem_mouse_24g_short_sleep_set_4ms:d0 52 00#f0 55 00 mem_mouse_24g_long_sleep_set_4ms:80 bb 00 mem_mouse_24g_fast_hop_count_4ms:05 mem_mouse_24g_tsniff_4ms:80 bb 00 00 @@ -329,8 +311,9 @@ mem_mouse_dpi_seting: 03 #mem_320x_dpi_0 1200 04 #mem_320x_dpi_1 1600 -01 #mem_320x_dpi_2 800 -02 #mem_320x_dpi_3 1000 +02 #mem_320x_dpi_2 1000 +01 #mem_320x_dpi_3 800 + 20 #mem_3212_dpi_0 2a #mem_3212_dpi_1 @@ -407,7 +390,7 @@ mem_sensor_ka8g2_init_new: 09 a5 -26 34 +46 34 19 04 60 07 69 04 @@ -511,7 +494,7 @@ #01 ADC_CONFIG_HVIN #02 ADC_CONFIG_GPIO mem_adc_clkdiv:0a -mem_adc_channel:09 +mem_adc_channel:00 #00 ADC_CH_VBAT #01 ADC_CH_VDCDC5V #06 ADC_CH_GPIO18 @@ -524,9 +507,21 @@ #0d ADC_CH_GPIO22 #0e ADC_CH_GPIO13 -mem_mouse_vdd_full_vol:a4 01 #4.2V -18 01#mem_mouse_vdd_empty_vol :2.8V -2c 01#mem_mouse_vdd_low_vol :3.0V +#adc +#mem_mouse_vdd_full_vol:4a 01 #3.3V +#2c 01#mem_mouse_vdd_empty_vol :3.0V +#40 01#mem_mouse_vdd_low_vol :3.2V + +#mem_adc_channel_gpio:04 +#04 +#02 +#01 +#03 +#00 +#05 +#06 +#07 + # rf debug #bit7:0 means disable rf debug function