diff --git a/ZheDaXiaoFuZi/Project/MDK/ZheJiangU_Xfz.uvguix.adm b/ZheDaXiaoFuZi/Project/MDK/ZheJiangU_Xfz.uvguix.adm index 3444ce6..e06ca41 100644 --- a/ZheDaXiaoFuZi/Project/MDK/ZheJiangU_Xfz.uvguix.adm +++ b/ZheDaXiaoFuZi/Project/MDK/ZheJiangU_Xfz.uvguix.adm @@ -11,7 +11,7 @@ 38003 Registers - 115 196 + 115 188 346 @@ -83,17 +83,17 @@ -1 - 237 - 976 - 2308 - 1262 + 267 + 60 + 1575 + 1269 0 - 3002 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000001600000003000000010000006C453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F6932632E63000000001373746D3332663178785F68616C5F6932632E6300000000B3A6BE00FFFFFFFF53453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4273705C4D63754273704932632E68000000000B4D63754273704932632E6800000000C5D4F200FFFFFFFF53453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4273705C4D63754273704932632E63000000000B4D63754273704932632E6300000000A5C2D700FFFFFFFF53453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4273705C4D63754273704164632E63000000000B4D63754273704164632E6300000000BECEA100FFFFFFFF64453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C424D453638305C626D653638785F646566732E68000000000D626D653638785F646566732E6800000000C5D4F200FFFFFFFF5F453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C424D453638305C626D653638782E680000000008626D653638782E6800000000FFDC7800FFFFFFFF5F453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C424D453638305C626D653638782E630000000008626D653638782E6300000000BECEA100FFFFFFFF50453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4170705C58667A4170702E63000000000858667A4170702E6300000000F0A0A100FFFFFFFF6E453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C5553522D34474341544454555C5573725F34474361744474754472762E6800000000115573725F34474361744474754472762E6800000000BCA8E100FFFFFFFF6E453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C5553522D34474341544454555C5573725F34474361744474754472762E6300000000115573725F34474361744474754472762E63000000009CC1B600FFFFFFFF55453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5379735C496E635C73746D33326631303378652E68000000000D73746D33326631303378652E6800000000F7B88600FFFFFFFF5A453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5379735C5372635C73797374656D5F73746D3332663178782E63000000001273797374656D5F73746D3332663178782E6300000000F6FA7D00FFFFFFFF5D453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C537461727475705C737461727475705F73746D33326631303378652E730000000015737461727475705F73746D33326631303378652E7300000000B5E99D00FFFFFFFF78453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C53656C662D4465737472756374696F6E5C4D637553656C664465737472756374696F6E4472762E6800000000174D637553656C664465737472756374696F6E4472762E68000000005FC3CF00FFFFFFFF78453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C53656C662D4465737472756374696F6E5C4D637553656C664465737472756374696F6E4472762E6300000000174D637553656C664465737472756374696F6E4472762E6300000000C5D4F200FFFFFFFF58453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B496E506172612E63000000000F4D63755461736B496E506172612E6300000000D9ADC200FFFFFFFF58453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D43555461736B496E506172612E68000000000F4D43555461736B496E506172612E6800000000C5D4F200FFFFFFFF5B453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B426C7565546F6F74682E6300000000124D63755461736B426C7565546F6F74682E6300000000F7B88600FFFFFFFF5A453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B506F736974696F6E2E6300000000114D63755461736B506F736974696F6E2E63000000009CC1B600FFFFFFFF5A453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B4C6F77506F7765722E6300000000114D63755461736B4C6F77506F7765722E6300000000BCA8E100FFFFFFFF5A453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B4D616E79506172612E6300000000114D63755461736B4D616E79506172612E6300000000F0A0A100FFFFFFFF6A453A5C4769745F70726F6A6563745C5869616F46757A695C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C453130342D425435325C4D637545313034425435324472762E6300000000104D637545313034425435324472762E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000001D0500005B010000FC0800000E040000 + 3269 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000017000000000000000100000062453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B4D616E79506172612E6300000000114D63755461736B4D616E79506172612E6300000000BECEA100FFFFFFFF5B453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4273705C4D63754273705274632E63000000000B4D63754273705274632E6300000000C5D4F200FFFFFFFF62453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B4C6F77506F7765722E6800000000114D63755461736B4C6F77506F7765722E6800000000B5E99D00FFFFFFFF62453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B4C6F77506F7765722E6300000000114D63755461736B4C6F77506F7765722E6300000000C5D4F200FFFFFFFF58453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4170705C58667A4170702E63000000000858667A4170702E6300000000F0A0A100FFFFFFFF63453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B426C7565546F6F74682E6300000000124D63755461736B426C7565546F6F74682E6300000000F6FA7D00FFFFFFFF70453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C426569446F754854595C426569446F754874794472762E63000000000E426569446F754874794472762E6300000000C5D4F200FFFFFFFF74453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C53544D3332463178785F48414C5F4472697665725C5372635C73746D3332663178785F68616C5F6932632E63000000001373746D3332663178785F68616C5F6932632E6300000000EAD6A300FFFFFFFF5B453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4273705C4D63754273704932632E68000000000B4D63754273704932632E6800000000C5D4F200FFFFFFFF5B453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4273705C4D63754273704932632E63000000000B4D63754273704932632E6300000000C1838300FFFFFFFF5B453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4273705C4D63754273704164632E63000000000B4D63754273704164632E6300000000C5D4F200FFFFFFFF6C453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C424D453638305C626D653638785F646566732E68000000000D626D653638785F646566732E6800000000B3A6BE00FFFFFFFF67453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C424D453638305C626D653638782E680000000008626D653638782E6800000000C5D4F200FFFFFFFF67453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C424D453638305C626D653638782E630000000008626D653638782E6300000000EAD6A300FFFFFFFF5D453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5379735C496E635C73746D33326631303378652E68000000000D73746D33326631303378652E6800000000C5D4F200FFFFFFFF62453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5379735C5372635C73797374656D5F73746D3332663178782E63000000001273797374656D5F73746D3332663178782E6300000000A5C2D700FFFFFFFF65453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C537461727475705C737461727475705F73746D33326631303378652E730000000015737461727475705F73746D33326631303378652E7300000000C5D4F200FFFFFFFF80453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C53656C662D4465737472756374696F6E5C4D637553656C664465737472756374696F6E4472762E6800000000174D637553656C664465737472756374696F6E4472762E6800000000D9ADC200FFFFFFFF80453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C53656C662D4465737472756374696F6E5C4D637553656C664465737472756374696F6E4472762E6300000000174D637553656C664465737472756374696F6E4472762E6300000000F7B88600FFFFFFFF60453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B496E506172612E63000000000F4D63755461736B496E506172612E63000000009CC1B600FFFFFFFF60453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D43555461736B496E506172612E68000000000F4D43555461736B496E506172612E6800000000BCA8E100FFFFFFFF62453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C5461736B5C4D63755461736B506F736974696F6E2E6300000000114D63755461736B506F736974696F6E2E6300000000F0A0A100FFFFFFFF72453A5C5A4D54535F70726F6A6563745C4769745F50524F4A4543545C58465A5C32303233303733315F5869616F46755A695F656D625C5A686544615869616F46755A695C5372635C5573725C4472697665725C4C6472765C453130342D425435325C4D637545313034425435324472762E6300000000104D637545313034425435324472762E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000081010000790100001F06000015040000 @@ -102,7 +102,7 @@ -1 -1 - 0 + 1 0 0 0 @@ -112,11 +112,11 @@ 0 16 - C40000004F00000070040000BD000000 + 000000004F00000039010000EB020000 16 - E20400005F0100008E080000CD010000 + 44000000790100007D01000015040000 @@ -132,11 +132,11 @@ 0 16 - 03000000660000003E010000E9020000 + 030000006600000036010000D2020000 16 - 3C00000053000000FC000000F3000000 + 6102000094020000A203000047050000 @@ -152,11 +152,11 @@ 0 16 - 03000000660000003E010000E9020000 + 030000006600000036010000D2020000 16 - 3C000000530000001F0100000F020000 + 6102000094020000A203000047050000 @@ -432,11 +432,11 @@ 0 16 - 03000000660000003E010000E9020000 + 030000006600000036010000D2020000 16 - 3C000000530000001F0100000F020000 + 6102000094020000A203000047050000 @@ -452,11 +452,11 @@ 0 16 - 03000000660000003E010000E9020000 + 030000006600000036010000D2020000 16 - 3C000000530000001F0100000F020000 + 6102000094020000A203000047050000 @@ -472,7 +472,7 @@ 0 16 - 030000001D03000021050000AE030000 + 0300000006030000D805000097030000 16 @@ -512,7 +512,7 @@ 0 16 - 030000001D03000021050000AE030000 + 0300000006030000D805000097030000 16 @@ -1112,11 +1112,11 @@ 0 16 - 03000000660000003E010000FF020000 + 030000006600000036010000D2020000 16 - 3C000000530000001F0100000F020000 + 6102000094020000A203000047050000 @@ -1132,7 +1132,7 @@ 0 16 - 030000001D03000021050000AE030000 + 0300000006030000D805000097030000 16 @@ -1152,7 +1152,7 @@ 0 16 - 030000001D03000021050000AE030000 + 0300000006030000D805000097030000 16 @@ -1232,7 +1232,7 @@ 0 16 - 00000000C703000024050000DA030000 + 00000000B0030000DB050000C3030000 16 @@ -1280,15 +1280,15 @@ - 2619 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000E20400005F0100008E080000CD010000C40000004F00000070040000BD0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000001800040000000000000CE0700005F0100008E080000B5020000B00300004F00000070040000A50100000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF410100004F00000045010000020300000100000002000010040000000100000042FFFFFF3C040000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000001E0400005F0100005F05000028040000000000004F00000041010000020300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB090000018000800000000000001E040000A50200008E080000270300000000000095010000700400001702000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000002030000240500000603000001000000010000100400000001000000E0FCFFFF6C000000FFFFFFFF04000000C5000000C7000000B401000077940000018000800000010000001E0400002C04000042090000ED040000000000000603000024050000C70300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 2639 + 000000000B000000000000000010000001000000FFFFFFFFFFFFFFFF390100004F0000003D010000EB02000001000000020000100400000001000000000000000000000000000000000000000000000001000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000FFFF02000B004354616262656450616E65001000000100000044000000790100007D01000015040000000000004F00000039010000EB0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000018000200000000000000801000079010000B4040000E7010000C40000004F00000070040000BD0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000001800040000000000000F403000079010000B4040000CF020000B00300004F00000070040000A50100000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB0900000180008000000000000044000000BF020000B4040000410300000000000095010000700400001702000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000EB020000DB050000EF02000001000000010000100400000001000000E0FCFFFF6C000000FFFFFFFF04000000C5000000C7000000B4010000779400000180008000000100000044000000190400001F060000DA04000000000000EF020000DB050000B00300000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2321 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001467735F557063436F6D6D5463704E6574636F6E6E960000000000000013001467735F557063436F6D6D5463704E6574636F6E6E1267735F746F55706353746153656E644275660456434234045643423304564342320C4D41535445525F5441534B5F0353746105534C4156450C4D545F57444F474672656564094C41534552434F4D4D1167735F6F7574707574466565646261636B0D756E7369676E656420636861721067735F4F757470757463757272656E740E67735F4F757470757453746174650A4D61737465725461736B154750494F5F50494E5F545950455F5354445F5750440D53455249414C5F5345525645520653455249414C034C454400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 + 2435 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000013674D63755461736B52657374617274426C75659600000000000000140013674D63755461736B52657374617274426C75650C4D63755461736B536C6565701553445F5350495F4C4F575F53504545445F4D4F44450E756933324D6178426974526174650B75693332426974526174650641434B5F4F4B056D6F6E74680C4D545F546F44415353656E640F4445564943455F574F524B5F5354411767735F74696D65536571446576696365576F726B537461144D545F546F55504354696D65536E6353746174651C4D545F546F4261736553746174696F6E54696D65536E6353746174650E67735F746F44617352756E5374611867735F746F4261736553746174696F6E54696D6553796E631067735F74696D65536571506572696F641667735F64657654696D65536571417474726962757465164445565F54494D455F5345515F415454524942555445096465766963654E756D0A4C6F63616C436F756E740B67735F66696C65446174650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 1423 @@ -1353,11 +1353,11 @@ 0 16 - C40000004F00000000060000BD000000 + C40000004F00000080070000BD000000 16 - 940100002B010000D505000099010000 + C40000006600000080070000D4000000 @@ -1373,7 +1373,7 @@ 0 16 - 0300000066000000BD0000006F020000 + 0300000066000000BD00000047030000 16 @@ -1393,7 +1393,7 @@ 0 16 - 0300000066000000BD0000004F020000 + 0300000066000000BD00000047030000 16 @@ -1413,7 +1413,7 @@ 0 16 - 07030000A3020000FD050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1433,7 +1433,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1453,7 +1453,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1473,7 +1473,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1513,7 +1513,7 @@ 0 16 - C70000006600000002050000A4000000 + C7000000660000007D070000A4000000 16 @@ -1533,7 +1533,7 @@ 0 16 - 07030000A3020000FD050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1553,7 +1553,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1573,7 +1573,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1593,7 +1593,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1613,7 +1613,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1633,7 +1633,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1653,7 +1653,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1673,7 +1673,7 @@ 0 16 - 0300000066000000BD0000004F020000 + 0300000066000000BD00000047030000 16 @@ -1693,7 +1693,7 @@ 0 16 - 0300000066000000BD0000004F020000 + 0300000066000000BD00000047030000 16 @@ -1733,7 +1733,7 @@ 0 16 - 000000008C020000000300000E030000 + 0000000064030000C0030000E6030000 16 @@ -1773,7 +1773,7 @@ 0 16 - C40000006300000000060000BD000000 + C40000006300000080070000BD000000 16 @@ -1793,7 +1793,7 @@ 0 16 - C70000006600000002050000A4000000 + C7000000660000007D070000A4000000 16 @@ -1853,7 +1853,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -1873,7 +1873,7 @@ 0 16 - C70000006600000002050000A4000000 + C7000000660000007D070000A4000000 16 @@ -1893,7 +1893,7 @@ 0 16 - C70000006600000002050000A4000000 + C7000000660000007D070000A4000000 16 @@ -1913,7 +1913,7 @@ 0 16 - C70000006600000002050000A4000000 + C7000000660000007D070000A4000000 16 @@ -2353,7 +2353,7 @@ 0 16 - 0300000066000000BD0000006F020000 + 0300000066000000BD00000047030000 16 @@ -2413,7 +2413,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -2433,7 +2433,7 @@ 0 16 - 07030000A302000080050000F5020000 + C70300007B0300007D070000CD030000 16 @@ -2473,7 +2473,7 @@ 0 16 - 000000000E0300000006000021030000 + 00000000E603000080070000F9030000 16 @@ -2522,14 +2522,14 @@ 2618 - 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFC4000000BD00000000060000C1000000010000000100001004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000001000000940100002B010000D505000099010000C40000004F00000000060000BD0000000000000040280056060000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000001800040000000000000800400002B0100004005000081020000B00300004F00000070040000A50100000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C400000088020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000D00000002B0100009001000044030000000000004F000000C0000000880200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000088020000000600008C02000001000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB090000018000800000010000005603000048030000D5050000CA030000040300008C020000000600000E03000000000000404100560E0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFF000300008C020000040300000E03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000A501000070040000A9010000000000000100000004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000000000000D00000008502000040050000F302000000000000A901000070040000170200000000000040820046040000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFC4000000BD00000080070000C1000000010000000100001004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000001000000C40000006600000080070000D4000000C40000004F00000080070000BD0000000000000040280056060000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000001800040000000000000B00300006600000070040000BC010000B00300004F00000070040000A50100000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C400000060030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000C000000077030000000000004F000000C0000000600300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000060030000800700006403000001000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800080000001000000C40300007B03000080070000FD030000C40300006403000080070000E603000000000000404100560E0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFFC003000064030000C4030000E603000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000A501000070040000A9010000000000000100000004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B4010000779400000180008000000000000000000000C0010000700400002E02000000000000A901000070040000170200000000000040820046040000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File - 2525 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000B7075693332427566666572960000000000000014000B70756933324275666665721F5461736B506173735468726F756768436C65617255617274526563764275661D675461736B506173735468726F75676848616E646C654461746142756617675A7468794D637553746172747570436F6E6650617468087569333253746570135461736B506173735468726F756768496E69741D675461736B436F6D6D5265637644617461427566526563764C6F63616C17544350E9809AE4BFA1E8BF9EE68EA5E79A84E78AB6E68018544350E9809AE4BFA1E8BF9EE68EA5E79A84E78AB6E6803F0C674C6F63616C4970506F72740767446573744970115461736B5761746368646F67467265656416675461736B436F6D6D48616E646C654461746142756618674D63755461736B4C6F776572506F776572506572696F64184D63755461736B4C6F77506F776572536574506572696F640A4750494F5F50494E5F37224D43555F5441534B5F424C5545544F4F54485F4F4E4F46465F4750494F5F504F5254154D63755461736B426C7565546F6F7468536C656570164D63755461736B426C7565546F6F746857616B6555701667426569446F7548747952657472794F70656E5374610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020001001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 + 2440 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001B674D63755461736B53656C664465737472756374696F6E4D6F6465960000000000000014001B674D63755461736B53656C664465737472756374696F6E4D6F64651C4D637553656C664465737472756374696F6E4472765365744D6F64651B4D63755461736B53657453656C66537472756374696F6E4D6F6465135461736B436F6D6D53656E644D657373616765115461736B506173734770696F436865636B044932433804493243370449324336044932433504493243340449324333034932430D4D6375427370493263496E6974134D43555F4253505F414443305F42454C4F4E471D675461736B436F6D6D5265637644617461427566526563764C6F63616C0E5A746D73447276527463496E69740D41534349495F49735370616365165A746D734273705561727436496E7448616E646C6572205461736B506173735468726F75676855617274365265637643616C6C6261636B184D6375447276426569446F754874794F70656E506F7765720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020001001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000000180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000 1423 @@ -2574,8 +2574,8 @@ 0 - 1536 - 864 + 1920 + 1080 @@ -2585,7 +2585,70 @@ 0 100 - 3 + 0 + + ..\..\Src\Usr\Task\McuTaskManyPara.c + 7 + 214 + 239 + 1 + + 0 + + + ..\..\Src\Usr\Bsp\McuBspRtc.c + 0 + 147 + 159 + 1 + + 0 + + + ..\..\Src\Usr\Task\McuTaskLowPower.h + 17 + 1 + 10 + 1 + + 0 + + + ..\..\Src\Usr\Task\McuTaskLowPower.c + 27 + 74 + 75 + 1 + + 0 + + + ..\..\Src\Usr\App\XfzApp.c + 23 + 127 + 155 + 1 + + 0 + + + ..\..\Src\Usr\Task\McuTaskBlueTooth.c + 0 + 658 + 670 + 1 + + 0 + + + ..\..\Src\Usr\Driver\Ldrv\BeiDouHTY\BeiDouHtyDrv.c + 0 + 1 + 1 + 1 + + 0 + ..\..\Src\STM32F1xx_HAL_Driver\Src\stm32f1xx_hal_i2c.c 39 @@ -2616,7 +2679,7 @@ ..\..\Src\Usr\Bsp\McuBspAdc.c 52 - 428 + 113 114 1 @@ -2649,33 +2712,6 @@ 0 - - ..\..\Src\Usr\App\XfzApp.c - 28 - 83 - 84 - 1 - - 0 - - - ..\..\Src\Usr\Driver\Ldrv\USR-4GCATDTU\Usr_4GCatDtuDrv.h - 0 - 1 - 15 - 1 - - 0 - - - ..\..\Src\Usr\Driver\Ldrv\USR-4GCATDTU\Usr_4GCatDtuDrv.c - 62 - 242 - 258 - 1 - - 0 - ..\..\Src\Sys\Inc\stm32f103xe.h 58 @@ -2739,15 +2775,6 @@ 0 - - ..\..\Src\Usr\Task\McuTaskBlueTooth.c - 43 - 331 - 346 - 1 - - 0 - ..\..\Src\Usr\Task\McuTaskPosition.c 0 @@ -2757,24 +2784,6 @@ 0 - - ..\..\Src\Usr\Task\McuTaskLowPower.c - 31 - 76 - 104 - 1 - - 0 - - - ..\..\Src\Usr\Task\McuTaskManyPara.c - 24 - 107 - 141 - 1 - - 0 - ..\..\Src\Usr\Driver\Ldrv\E104-BT52\McuE104BT52Drv.c 71 diff --git a/ZheDaXiaoFuZi/Project/MDK/ZheJiangU_Xfz.uvoptx b/ZheDaXiaoFuZi/Project/MDK/ZheJiangU_Xfz.uvoptx index d3b06cd..54e473d 100644 --- a/ZheDaXiaoFuZi/Project/MDK/ZheJiangU_Xfz.uvoptx +++ b/ZheDaXiaoFuZi/Project/MDK/ZheJiangU_Xfz.uvoptx @@ -1272,7 +1272,7 @@ 9 83 1 - 1 + 0 0 0 ..\..\Src\Usr\Driver\Ldrv\BME680\bme68x.c diff --git a/ZheDaXiaoFuZi/Src/Usr/Driver/Ldrv/USR-4GCATDTU/Usr_4GCatDtuDrv.c b/ZheDaXiaoFuZi/Src/Usr/Driver/Ldrv/USR-4GCATDTU/Usr_4GCatDtuDrv.c new file mode 100644 index 0000000..5f4b966 --- /dev/null +++ b/ZheDaXiaoFuZi/Src/Usr/Driver/Ldrv/USR-4GCATDTU/Usr_4GCatDtuDrv.c @@ -0,0 +1,304 @@ +#include "Usr_4GCatDtuDrv.h" +#include "McuBspUart.h" +#include "McuBspGPIO.h" +#include "ZthyToolCheck.h" + +#include +#include +#include + +#define DRV_4GCATDTU_RXBUF_LEN 1024 + +static char g4GCatDtuRxBuf[DRV_4GCATDTU_RXBUF_LEN] = {0}; // 能够存放住两帧数据，主要为了容错 +static unsigned short g4GCatDtuRxBufTemp = 0; // 当前接收数据的末期所在位置 +static unsigned char g4GCatDtuRetryOpenSta = 0; // 北斗模块当前的开关状态 +static uint32_t gDeviceType = 0; // 设备类型 +static uint32_t gDeviceId = 12; // 设备ID + +static uint8_t gTransTBuf4g[220] = {0}; + +/* 接收函数 */ +static void McuDrv4GCatDtuRecv(unsigned char data); +/* 获取4G返回值 */ +static int McuDrv4GCatDtuRead(uint8_t *Buf, uint16_t BufLen); +/* 4G发送 */ +static int McuDrv4GCatDtuSendMessage(uint8_t *Buf, uint16_t BufLen); + +int McuDrv4GCatDtuInit(void) +{ + MCU_BSP_UART_CONF UartConfig = {0}; + UartConfig.BaudRate = MCU_DRV_4G_CAT_DTU_UART_BAUDRATE; + UartConfig.WordLength = MCU_DRV_4G_CAT_DTU_UART_WORDLEN; + UartConfig.StopBits = MCU_DRV_4G_CAT_DTU_UART_STOPBITS; + UartConfig.Parity = MCU_DRV_4G_CAT_DTU_UART_PARITY; + UartConfig.Mode = MCU_DRV_4G_CAT_DTU_UART_MODE; + if (McuBspUartInit(MCU_DRV_4G_CAT_DTU_UART_ID, &UartConfig, NULL, NULL) < 0) { + return -1; + } + /* 设置接收 */ + McuBspUartStartRecv(MCU_DRV_4G_CAT_DTU_UART_ID); + /* 电源控制 */ + McuBspGpioInit(MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_PORT, MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_PIN, + MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_MODE, MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_SPEED, + MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_PULL, 0, NULL); + McuDrv4GCatDtuClosePower(); + return 0; +} + +/* 设置4G连接 */ +void McuDrv4GCatDtuSetConnOpt(unsigned char type, unsigned char *Ipbuf, unsigned short port) +{ + char buff[128] = {0}; + // 切换到4G接收 + McuDrv4GCatDtuSetRecv(); + McuDrv4GCatDtuSendMessage((uint8_t *)"+++", (uint16_t)strlen("+++")); + HAL_Delay(800); + McuDrv4GCatDtuSendMessage((uint8_t *)"a", (uint16_t)strlen("a")); + HAL_Delay(800); + if (type == MCU_DRV_4G_CAT_DTU_TCP_TYPE) { + sprintf(buff, "AT+SOCKA=TCP,%s,%d\r\n", Ipbuf, port); + McuDrv4GCatDtuSendMessage((uint8_t *)buff, (uint16_t)strlen(buff)); + HAL_Delay(800); + sprintf(buff, "AT+SOCKASL=LONG\r\n"); + McuDrv4GCatDtuSendMessage((uint8_t *)buff, (uint16_t)strlen(buff)); + HAL_Delay(800); + } else { + sprintf(buff, "AT+SOCKA=UDP,%s,%d\r\n", Ipbuf, port); + McuDrv4GCatDtuSendMessage((uint8_t *)buff, (uint16_t)strlen(buff)); + HAL_Delay(800); + } + sprintf(buff, "AT+S\r\n"); + McuDrv4GCatDtuSendMessage((uint8_t *)buff, (uint16_t)strlen(buff)); +} + +/* 查询4G模块的通信状态 */ +int McuDrv4GCatDtuSta(void) +{ + char Rbuf[64] = {0}; + char buff[128] = {0}; + int Csq; + char *p; + // 切换到4G接收 + McuDrv4GCatDtuSetRecv(); + McuDrv4GCatDtuSendMessage((uint8_t *)"+++", (uint16_t)strlen("+++")); + HAL_Delay(800); + McuDrv4GCatDtuSendMessage((uint8_t *)"a", (uint16_t)strlen("a")); + HAL_Delay(800); + sprintf(buff, "AT+CSQ\r\n"); + McuDrv4GCatDtuSendMessage((uint8_t *)buff, (uint16_t)strlen(buff)); + HAL_Delay(800); + McuDrv4GCatDtuRead((uint8_t *)Rbuf, sizeof(Rbuf)); + HAL_Delay(800); + sprintf(buff, "AT+ENTM\r\n"); + McuDrv4GCatDtuSendMessage((uint8_t *)buff, (uint16_t)strlen(buff)); + HAL_Delay(800); + p = strstr(Rbuf, "+CSQ:"); + if (p != NULL) { + p[8] = 0; + Csq = atoi(p + 6); + if (Csq > 100) { + return -1; + } else { + return Csq; + } + } + return -1; +} + +/*判断电源模块的当前状态*/ +unsigned char McuDrv4GCatDtuPowerSta(void) +{ + return g4GCatDtuRetryOpenSta; +} + +/* 设置北斗接收 */ +void McuDrv4GCatDtuSetRecv(void) +{ + McuBspUartSetRecvCallback(MCU_DRV_4G_CAT_DTU_UART_ID, McuDrv4GCatDtuRecv); +} + +/* 4G打包发送 */ +uint32_t McuDrv4GSendMessage(uint16_t MessageId, uint16_t *Serial, uint8_t *SendBuf, uint32_t SendBufLen) +{ + uint32_t i = 0; + uint32_t j = 0; + uint32_t k = 0; + uint32_t e =0; + uint32_t RealSendLen = 0; + uint16_t SendPiece = 0; // 发送条数，用来记录是否具有分包 + uint16_t MessageProperties = 0; // 消息属性 + uint8_t SendBufTmp[1050] = {0}; + if (Serial == NULL) { + return 0; + } + SendPiece = (SendBufLen / 1023) + 1; // 计算总共需要发几条信息 + for (i = 0; i < SendPiece; i++) { + if (SendPiece != 1) { + if (i != (SendPiece - 1)) { + MessageProperties = 0x2000 | 0x0c00 | 1023; + } else { + MessageProperties = 0x2000 | 0x0c00 | (SendBufLen % 1023); + } + } else { + MessageProperties = 0x0000 | 0x0c00 | SendBufLen; + } + j = 0; + /* 消息ID */ + SendBufTmp[j] = (uint8_t)((MessageId & 0xff00) >> 8); + j++; + SendBufTmp[j] = (uint8_t)(MessageId & 0x00ff); + j++; + /* 设备类型 */ + SendBufTmp[j] = (uint8_t)((gDeviceType & 0xff000000) >> 24); + j++; + SendBufTmp[j] = (uint8_t)((gDeviceType & 0x00ff0000) >> 16); + j++; + SendBufTmp[j] = (uint8_t)((gDeviceType & 0x0000ff00) >> 8); + j++; + SendBufTmp[j] = (uint8_t)(gDeviceType & 0x000000ff); + j++; + /* 设备ID号 */ + SendBufTmp[j] = (uint8_t)((gDeviceId & 0xff000000) >> 24); + j++; + SendBufTmp[j] = (uint8_t)((gDeviceId & 0x00ff0000) >> 16); + j++; + SendBufTmp[j] = (uint8_t)((gDeviceId & 0x0000ff00) >> 8); + j++; + SendBufTmp[j] = (uint8_t)(gDeviceId & 0x000000ff); + j++; + /* 消息体属性 */ + SendBufTmp[j] = (uint8_t)((MessageProperties & 0xff00) >> 8); + j++; + SendBufTmp[j] = (uint8_t)(MessageProperties & 0x00ff); + j++; + /* 协议版本号 */ + SendBufTmp[j] = 0x00; + j++; + SendBufTmp[j] = 0x01; + j++; + /* 消息流水号 */ + SendBufTmp[j] = (uint8_t)(((*Serial) & 0xff00) >> 8); + j++; + SendBufTmp[j] = (uint8_t)((*Serial) & 0x00ff); + j++; + /* 消息包装项 + 消息内容 */ + if (SendPiece != 1) { + /* 消息总包数 */ + SendBufTmp[j] = (uint8_t)((SendPiece & 0xff00) >> 8); + j++; + SendBufTmp[j] = (uint8_t)(SendPiece & 0x00ff); + j++; + /* 包序号 */ + SendBufTmp[j] = (uint8_t)(((i + 1) & 0xff00) >> 8); + j++; + SendBufTmp[j] = (uint8_t)((i + 1) & 0x00ff); + j++; + if (i != (SendPiece - 1)) { + memcpy(&SendBufTmp[j], &(SendBuf[1023 * i]), 1023); + j += 1023; + } else { + memcpy(&SendBufTmp[j], &(SendBuf[1023 * i]), SendBufLen % 1023); + j += (SendBufLen % 1023); + } + } else { + if ((SendBuf != NULL) && (SendBufLen != 0)) { + memcpy(&SendBufTmp[j], SendBuf, SendBufLen); + j += SendBufLen; + } + } + /* 进行校验 */ + SendBufTmp[j] = 0; + ZthyToolCheckCrc8_0x31(SendBufTmp, j, &SendBufTmp[j]); + j++; + /* 进行转义 */ + e = 0; + gTransTBuf4g[e] = 0x7f; // 标志位 + e++; + for (k = 0; k < j; k++) { + if (SendBufTmp[k] == 0x7e) { + gTransTBuf4g[e] = 0x7e; + e++; + gTransTBuf4g[e] = 0x01; + e++; + } else if (SendBufTmp[k] == 0x7f) { + gTransTBuf4g[e] = 0x7e; + e++; + gTransTBuf4g[e] = 0x02; + e++; + } else { + gTransTBuf4g[e] = SendBufTmp[k]; + e++; + } + } + gTransTBuf4g[e] = 0x7f; // 标志位 + e++; + /* 发送数据 */ + if (1 == McuDrv4GCatDtuPowerSta()) { + McuBspUartSend(MCU_DRV_4G_CAT_DTU_UART_ID, gTransTBuf4g, e); + } + RealSendLen += e; + } + return RealSendLen; +} + +/* 4G发送 */ +static int McuDrv4GCatDtuSendMessage(uint8_t *Buf, uint16_t BufLen) +{ + if (g4GCatDtuRxBufTemp > 0) { + char Rbuf[DRV_4GCATDTU_RXBUF_LEN] = {0}; + McuDrv4GCatDtuRead((uint8_t *)Rbuf, g4GCatDtuRxBufTemp); + } + return McuBspUartSend(MCU_DRV_4G_CAT_DTU_UART_ID, Buf, BufLen); +} + +/* 打开电源 */ +void McuDrv4GCatDtuOpenPower(void) +{ + g4GCatDtuRetryOpenSta = 1; + McuBspGpioSetLevel(MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_PORT, MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_PIN, + MCU_BSP_GPIO_OUT_HIGH); + HAL_Delay(50); +} + +/* 关闭电源 */ +void McuDrv4GCatDtuClosePower(void) +{ + g4GCatDtuRetryOpenSta = 0; + McuBspGpioSetLevel(MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_PORT, MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_PIN, + MCU_BSP_GPIO_OUT_LOW); + HAL_Delay(50); +} + +/* 获取4G返回值 */ +static int McuDrv4GCatDtuRead(uint8_t *Buf, uint16_t BufLen) +{ + int i = 0; + while (g4GCatDtuRxBufTemp < BufLen){ + HAL_Delay(10); + i++; + /* 超时 */ + if (i >= 100) { + if (g4GCatDtuRxBufTemp == 0) { + return -1; + } else { + break; + } + } + } + for (i = 0; i < g4GCatDtuRxBufTemp; i++) { + Buf[i] = g4GCatDtuRxBuf[i]; + } + g4GCatDtuRxBufTemp = 0; + return i; +} + +/* 接收函数 */ +static void McuDrv4GCatDtuRecv(unsigned char data) +{ + if (data == 0) { + return; + } + g4GCatDtuRxBuf[g4GCatDtuRxBufTemp] = data; + g4GCatDtuRxBufTemp ++; + g4GCatDtuRxBufTemp = g4GCatDtuRxBufTemp % DRV_4GCATDTU_RXBUF_LEN; +} diff --git a/ZheDaXiaoFuZi/Src/Usr/Driver/Ldrv/USR-4GCATDTU/Usr_4GCatDtuDrv.h b/ZheDaXiaoFuZi/Src/Usr/Driver/Ldrv/USR-4GCATDTU/Usr_4GCatDtuDrv.h new file mode 100644 index 0000000..63046e1 --- /dev/null +++ b/ZheDaXiaoFuZi/Src/Usr/Driver/Ldrv/USR-4GCATDTU/Usr_4GCatDtuDrv.h @@ -0,0 +1,40 @@ +#ifndef _USR_4G_CAT_DTU_DRV_H_ +#define _USR_4G_CAT_DTU_DRV_H_ + +#include +#include +#define MCU_DRV_4G_CAT_DTU_UART_ID MCU_BSP_UART1_ID +#define MCU_DRV_4G_CAT_DTU_UART_BAUDRATE 115200 // 波特率 +#define MCU_DRV_4G_CAT_DTU_UART_WORDLEN UART_WORDLENGTH_8B // 8位字长 +#define MCU_DRV_4G_CAT_DTU_UART_STOPBITS UART_STOPBITS_1 // 1位停止位 +#define MCU_DRV_4G_CAT_DTU_UART_PARITY UART_PARITY_NONE // 无奇偶校验位 +#define MCU_DRV_4G_CAT_DTU_UART_MODE UART_MODE_TX_RX // 读写模式 + +#define MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_PIN GPIO_PIN_9 +#define MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_PORT GPIOE +#define MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_MODE GPIO_MODE_OUTPUT_PP +#define MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_PULL GPIO_PULLDOWN +#define MCU_DRV_4G_CAT_DTU_CTRL_POWER_GPIO_SPEED GPIO_SPEED_FREQ_HIGH + +#define MCU_DRV_4G_CAT_DTU_TCP_TYPE 0 +#define MCU_DRV_4G_CAT_DTU_UDP_TYPE 1 + +int McuDrv4GCatDtuInit(void); +/* 设置4G连接 */ +void McuDrv4GCatDtuSetConnOpt(unsigned char type, unsigned char *Ipbuf, unsigned short port); +/* 查询4G模块的通信状态 */ +int McuDrv4GCatDtuSta(void); +/* 设置北斗接收 */ +void McuDrv4GCatDtuSetRecv(void); +/*判断电源模块的当前状态*/ +unsigned char McuDrv4GCatDtuPowerSta(void); +/* 打开电源 */ +void McuDrv4GCatDtuOpenPower(void); +/* 关闭电源 */ +void McuDrv4GCatDtuClosePower(void); +/*判断电源模块的当前状态*/ +unsigned char McuDrv4GCatDtuPowerSta(void); +/* 4G打包发送 */ +uint32_t McuDrv4GSendMessage(uint16_t MessageId, uint16_t *Serial, uint8_t *SendBuf, uint32_t SendBufLen); + +#endif