From 690cf2bb083cfc49c402d98f6d45f9cc0350e605 Mon Sep 17 00:00:00 2001 From: tianjialong Date: Wed, 1 Mar 2023 15:13:34 +0800 Subject: [PATCH] =?UTF-8?q?update=E5=A4=9A=E7=BC=96=E7=A0=81=E5=99=A8?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MDK-ARM/LWIP.uvguix.29643 | 21 +- MDK-ARM/LWIP.uvoptx | 46 +- MDK-ARM/LWIP.uvprojx | 1088 ++++++++++++++++++++++++++++++++++++++++++--- usersrc/encoder.c | 26 +- usersrc/zboard.h | 2 +- 5 files changed, 1090 insertions(+), 93 deletions(-) diff --git a/MDK-ARM/LWIP.uvguix.29643 b/MDK-ARM/LWIP.uvguix.29643 index fda2a10..9f16f06 100644 --- a/MDK-ARM/LWIP.uvguix.29643 +++ b/MDK-ARM/LWIP.uvguix.29643 @@ -110,8 +110,8 @@ 0 - 726 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000005000000000000000100000052433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C5372635C6672656572746F732E63000000000A6672656572746F732E6300000000C5D4F200FFFFFFFF56433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C757365726D61696E2E63000000000A757365726D61696E2E6300000000FFDC7800FFFFFFFF54433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C7A666C6173682E6300000000087A666C6173682E6300000000BECEA100FFFFFFFF54433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C636F6E6669672E680000000008636F6E6669672E6800000000F0A0A100FFFFFFFF54433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C636F6E6669672E630000000008636F6E6669672E6300000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F0000B1020000 + 836 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000006000000050000000100000052433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C5372635C6672656572746F732E63000000000A6672656572746F732E6300000000C5D4F200FFFFFFFF56433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C757365726D61696E2E63000000000A757365726D61696E2E6300000000FFDC7800FFFFFFFF54433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C7A666C6173682E6300000000087A666C6173682E6300000000BECEA100FFFFFFFF54433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C636F6E6669672E680000000008636F6E6669672E6800000000F0A0A100FFFFFFFF54433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C636F6E6669672E630000000008636F6E6669672E6300000000BCA8E100FFFFFFFF54433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C7A626F6172642E6800000000087A626F6172642E68000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F0000B1020000 @@ -1806,7 +1806,7 @@ File 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 968 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000044C57495096000000000000000100044C574950000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA0000000000000000000000000000000000000000000000000100000001000000960000000300205000000000044C57495096000000000000000100044C574950000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1862,7 +1862,7 @@ 0 100 - 0 + 5 ../Src/freertos.c 1 @@ -1908,6 +1908,15 @@ 0 + + ..\usersrc\zboard.h + 0 + 1 + 18 + 1 + + 0 + diff --git a/MDK-ARM/LWIP.uvoptx b/MDK-ARM/LWIP.uvoptx index 81e4036..f39300b 100644 --- a/MDK-ARM/LWIP.uvoptx +++ b/MDK-ARM/LWIP.uvoptx @@ -1,4 +1,4 @@ - + 1.0 @@ -45,7 +45,7 @@ 79 66 8 - + 1 @@ -104,16 +104,16 @@ 0 0 3 - - - - - - - - - - + + + + + + + + + + BIN\CMSIS_AGDI.dll @@ -133,7 +133,7 @@ -U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F4xx_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F407ZETx$CMSIS\Flash\STM32F4xx_512.FLM) - + 0 @@ -163,19 +163,19 @@ 0 0 - - + + 0 0 0 - - - - - - - - + + + + + + + + 1 0 diff --git a/MDK-ARM/LWIP.uvprojx b/MDK-ARM/LWIP.uvprojx index 140632b..e6217d6 100644 --- a/MDK-ARM/LWIP.uvprojx +++ b/MDK-ARM/LWIP.uvprojx @@ -1,7 +1,10 @@ - - + + + 2.1 +
### uVision Project, (C) Keil Software
+ LWIP @@ -16,28 +19,28 @@ Keil.STM32F4xx_DFP.2.16.0 http://www.keil.com/pack/ IRAM(0x20000000-0x2001FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x807FFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4") - - - - - - - - - - - - - - + + + + + + + + + + + + + + $$Device:STM32F407ZETx$CMSIS\SVD\STM32F40x.svd 0 0 - - - - - + + + + + 0 0 @@ -52,15 +55,15 @@ 1 1 0 - + 1 0 0 0 0 - - + + 0 0 0 @@ -69,8 +72,8 @@ 0 0 - - + + 0 0 0 @@ -79,15 +82,15 @@ 0 0 - - + + 0 0 0 0 0 - + 0 @@ -101,8 +104,8 @@ 0 0 3 - - + + 0 @@ -135,11 +138,11 @@ 1 STLink\ST-LINKIII-KEIL_SWO.dll - - - - - + + + + + 0 @@ -172,7 +175,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -306,7 +309,7 @@ 0x10000 - + 1 @@ -333,9 +336,9 @@ 0 0 - + USE_HAL_DRIVER,STM32F407xx - + ../Inc;../Middlewares/Third_Party/LwIP/src/include;../Middlewares/Third_Party/LwIP/system;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Middlewares/Third_Party/FreeRTOS/Source/portable/RVDS/ARM_CM4F;../Middlewares/Third_Party/LwIP/src/include/netif/ppp;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Middlewares/Third_Party/FreeRTOS/Source/include;../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS;../Middlewares/Third_Party/LwIP/src/include/lwip;../Middlewares/Third_Party/LwIP/src/include/lwip/apps;../Middlewares/Third_Party/LwIP/src/include/lwip/priv;../Middlewares/Third_Party/LwIP/src/include/lwip/prot;../Middlewares/Third_Party/LwIP/src/include/netif;../Middlewares/Third_Party/LwIP/system/arch;../Drivers/CMSIS/Include;../Drivers/BSP/Components/lan8742;../Middlewares/Third_Party/LwIP/src/include/compat/posix;../Middlewares/Third_Party/LwIP/src/include/compat/posix/arpa;../Middlewares/Third_Party/LwIP/src/include/compat/posix/net;../Middlewares/Third_Party/LwIP/src/include/compat/posix/sys;../Middlewares/Third_Party/LwIP/src/include/compat/stdc @@ -351,9 +354,9 @@ 0 1 - - - + + + ..\\Inc;..\Inc @@ -366,13 +369,13 @@ 0 0x08000000 0x20000000 - - - - - - - + + + + + + + @@ -432,6 +435,8 @@ 2 2 11 + + 1 @@ -459,6 +464,12 @@ 2 2 2 + + + + + + @@ -480,6 +491,8 @@ 2 2 11 + + 1 @@ -507,6 +520,12 @@ 2 2 2 + + + + + + @@ -538,6 +557,8 @@ 2 2 11 + + 1 @@ -565,6 +586,12 @@ 2 2 2 + + + + + + @@ -621,6 +648,8 @@ 2 2 11 + + 0 @@ -648,6 +677,12 @@ 2 2 2 + + + + + + 2 @@ -660,6 +695,12 @@ 2 2 0 + + + + + + @@ -681,6 +722,8 @@ 2 2 11 + + 1 @@ -708,6 +751,12 @@ 2 2 2 + + + + + + @@ -729,6 +778,8 @@ 2 2 11 + + 0 @@ -756,6 +807,12 @@ 2 2 2 + + + + + + 2 @@ -768,6 +825,12 @@ 2 2 0 + + + + + + @@ -789,6 +852,8 @@ 2 2 11 + + 1 @@ -816,6 +881,12 @@ 2 2 2 + + + + + + @@ -837,6 +908,8 @@ 2 2 11 + + 1 @@ -864,6 +937,12 @@ 2 2 2 + + + + + + @@ -885,6 +964,8 @@ 2 2 11 + + 1 @@ -912,6 +993,12 @@ 2 2 2 + + + + + + @@ -933,6 +1020,8 @@ 2 2 11 + + 1 @@ -960,6 +1049,12 @@ 2 2 2 + + + + + + @@ -981,6 +1076,8 @@ 2 2 11 + + 1 @@ -1008,6 +1105,12 @@ 2 2 2 + + + + + + @@ -1029,6 +1132,8 @@ 2 2 11 + + 1 @@ -1056,6 +1161,12 @@ 2 2 2 + + + + + + @@ -1077,6 +1188,8 @@ 2 2 11 + + 1 @@ -1104,6 +1217,12 @@ 2 2 2 + + + + + + @@ -1125,6 +1244,8 @@ 2 2 11 + + 1 @@ -1152,6 +1273,12 @@ 2 2 2 + + + + + + @@ -1173,6 +1300,8 @@ 2 2 11 + + 1 @@ -1200,6 +1329,12 @@ 2 2 2 + + + + + + @@ -1221,6 +1356,8 @@ 2 2 11 + + 1 @@ -1248,6 +1385,12 @@ 2 2 2 + + + + + + @@ -1269,6 +1412,8 @@ 2 2 11 + + 1 @@ -1296,6 +1441,12 @@ 2 2 2 + + + + + + @@ -1317,6 +1468,8 @@ 2 2 11 + + 1 @@ -1344,6 +1497,12 @@ 2 2 2 + + + + + + @@ -1365,6 +1524,8 @@ 2 2 11 + + 1 @@ -1392,6 +1553,12 @@ 2 2 2 + + + + + + @@ -1413,6 +1580,8 @@ 2 2 11 + + 1 @@ -1440,6 +1609,12 @@ 2 2 2 + + + + + + @@ -1461,6 +1636,8 @@ 2 2 11 + + 1 @@ -1488,6 +1665,12 @@ 2 2 2 + + + + + + @@ -1509,6 +1692,8 @@ 2 2 11 + + 1 @@ -1536,6 +1721,12 @@ 2 2 2 + + + + + + @@ -1557,6 +1748,8 @@ 2 2 11 + + 1 @@ -1584,6 +1777,12 @@ 2 2 2 + + + + + + @@ -1605,6 +1804,8 @@ 2 2 11 + + 0 @@ -1632,6 +1833,12 @@ 2 2 2 + + + + + + 2 @@ -1644,6 +1851,12 @@ 2 2 0 + + + + + + @@ -1665,6 +1878,8 @@ 2 2 11 + + 1 @@ -1692,6 +1907,12 @@ 2 2 2 + + + + + + @@ -1713,6 +1934,8 @@ 2 2 11 + + 0 @@ -1740,6 +1963,12 @@ 2 2 2 + + + + + + 2 @@ -1752,6 +1981,12 @@ 2 2 0 + + + + + + @@ -1773,6 +2008,8 @@ 2 2 11 + + 1 @@ -1800,6 +2037,12 @@ 2 2 2 + + + + + + @@ -1821,6 +2064,8 @@ 2 2 11 + + 1 @@ -1848,6 +2093,12 @@ 2 2 2 + + + + + + @@ -1869,6 +2120,8 @@ 2 2 11 + + 1 @@ -1896,6 +2149,12 @@ 2 2 2 + + + + + + @@ -1917,6 +2176,8 @@ 2 2 11 + + 1 @@ -1944,6 +2205,12 @@ 2 2 2 + + + + + + @@ -1965,6 +2232,8 @@ 2 2 11 + + 1 @@ -1992,6 +2261,12 @@ 2 2 2 + + + + + + @@ -2013,6 +2288,8 @@ 2 2 11 + + 1 @@ -2040,6 +2317,12 @@ 2 2 2 + + + + + + @@ -2061,6 +2344,8 @@ 2 2 11 + + 1 @@ -2088,6 +2373,12 @@ 2 2 2 + + + + + + @@ -2109,6 +2400,8 @@ 2 2 11 + + 1 @@ -2136,6 +2429,12 @@ 2 2 2 + + + + + + @@ -2157,6 +2456,8 @@ 2 2 11 + + 1 @@ -2184,6 +2485,12 @@ 2 2 2 + + + + + + @@ -2205,6 +2512,8 @@ 2 2 11 + + 1 @@ -2232,6 +2541,12 @@ 2 2 2 + + + + + + @@ -2253,6 +2568,8 @@ 2 2 11 + + 0 @@ -2280,6 +2597,12 @@ 2 2 2 + + + + + + 2 @@ -2292,6 +2615,12 @@ 2 2 0 + + + + + + @@ -2313,6 +2642,8 @@ 2 2 11 + + 1 @@ -2340,6 +2671,12 @@ 2 2 2 + + + + + + @@ -2361,6 +2698,8 @@ 2 2 11 + + 1 @@ -2388,6 +2727,12 @@ 2 2 2 + + + + + + @@ -2409,6 +2754,8 @@ 2 2 11 + + 1 @@ -2436,6 +2783,12 @@ 2 2 2 + + + + + + @@ -2457,6 +2810,8 @@ 2 2 11 + + 1 @@ -2484,6 +2839,12 @@ 2 2 2 + + + + + + @@ -2505,6 +2866,8 @@ 2 2 11 + + 1 @@ -2532,6 +2895,12 @@ 2 2 2 + + + + + + @@ -2553,6 +2922,8 @@ 2 2 11 + + 1 @@ -2580,6 +2951,12 @@ 2 2 2 + + + + + + @@ -2601,6 +2978,8 @@ 2 2 11 + + 1 @@ -2628,6 +3007,12 @@ 2 2 2 + + + + + + @@ -2649,6 +3034,8 @@ 2 2 11 + + 1 @@ -2676,6 +3063,12 @@ 2 2 2 + + + + + + @@ -2697,6 +3090,8 @@ 2 2 11 + + 1 @@ -2724,6 +3119,12 @@ 2 2 2 + + + + + + @@ -2745,6 +3146,8 @@ 2 2 11 + + 1 @@ -2772,6 +3175,12 @@ 2 2 2 + + + + + + @@ -2793,6 +3202,8 @@ 2 2 11 + + 1 @@ -2820,6 +3231,12 @@ 2 2 2 + + + + + + @@ -2841,6 +3258,8 @@ 2 2 11 + + 1 @@ -2868,6 +3287,12 @@ 2 2 2 + + + + + + @@ -2889,6 +3314,8 @@ 2 2 11 + + 1 @@ -2916,6 +3343,12 @@ 2 2 2 + + + + + + @@ -2937,6 +3370,8 @@ 2 2 11 + + 1 @@ -2964,6 +3399,12 @@ 2 2 2 + + + + + + @@ -2985,6 +3426,8 @@ 2 2 11 + + 1 @@ -3012,6 +3455,12 @@ 2 2 2 + + + + + + @@ -3033,6 +3482,8 @@ 2 2 11 + + 1 @@ -3060,6 +3511,12 @@ 2 2 2 + + + + + + @@ -3081,6 +3538,8 @@ 2 2 11 + + 1 @@ -3108,6 +3567,12 @@ 2 2 2 + + + + + + @@ -3129,6 +3594,8 @@ 2 2 11 + + 1 @@ -3156,6 +3623,12 @@ 2 2 2 + + + + + + @@ -3177,6 +3650,8 @@ 2 2 11 + + 1 @@ -3204,6 +3679,12 @@ 2 2 2 + + + + + + @@ -3225,6 +3706,8 @@ 2 2 11 + + 1 @@ -3252,6 +3735,12 @@ 2 2 2 + + + + + + @@ -3273,6 +3762,8 @@ 2 2 11 + + 1 @@ -3300,6 +3791,12 @@ 2 2 2 + + + + + + @@ -3321,6 +3818,8 @@ 2 2 11 + + 1 @@ -3348,6 +3847,12 @@ 2 2 2 + + + + + + @@ -3369,6 +3874,8 @@ 2 2 11 + + 1 @@ -3396,6 +3903,12 @@ 2 2 2 + + + + + + @@ -3417,6 +3930,8 @@ 2 2 11 + + 1 @@ -3444,6 +3959,12 @@ 2 2 2 + + + + + + @@ -3465,6 +3986,8 @@ 2 2 11 + + 1 @@ -3492,6 +4015,12 @@ 2 2 2 + + + + + + @@ -3513,6 +4042,8 @@ 2 2 11 + + 1 @@ -3540,6 +4071,12 @@ 2 2 2 + + + + + + @@ -3561,6 +4098,8 @@ 2 2 11 + + 1 @@ -3588,6 +4127,12 @@ 2 2 2 + + + + + + @@ -3609,6 +4154,8 @@ 2 2 11 + + 1 @@ -3636,6 +4183,12 @@ 2 2 2 + + + + + + @@ -3657,6 +4210,8 @@ 2 2 11 + + 1 @@ -3684,6 +4239,12 @@ 2 2 2 + + + + + + @@ -3705,6 +4266,8 @@ 2 2 11 + + 1 @@ -3732,6 +4295,12 @@ 2 2 2 + + + + + + @@ -3753,6 +4322,8 @@ 2 2 11 + + 1 @@ -3780,6 +4351,12 @@ 2 2 2 + + + + + + @@ -3801,6 +4378,8 @@ 2 2 11 + + 1 @@ -3828,6 +4407,12 @@ 2 2 2 + + + + + + @@ -3849,6 +4434,8 @@ 2 2 11 + + 1 @@ -3876,6 +4463,12 @@ 2 2 2 + + + + + + @@ -3897,6 +4490,8 @@ 2 2 11 + + 1 @@ -3924,6 +4519,12 @@ 2 2 2 + + + + + + @@ -3945,6 +4546,8 @@ 2 2 11 + + 1 @@ -3972,6 +4575,12 @@ 2 2 2 + + + + + + @@ -3993,6 +4602,8 @@ 2 2 11 + + 1 @@ -4020,6 +4631,12 @@ 2 2 2 + + + + + + @@ -4041,6 +4658,8 @@ 2 2 11 + + 1 @@ -4068,6 +4687,12 @@ 2 2 2 + + + + + + @@ -4089,6 +4714,8 @@ 2 2 11 + + 1 @@ -4116,6 +4743,12 @@ 2 2 2 + + + + + + @@ -4137,6 +4770,8 @@ 2 2 11 + + 1 @@ -4164,6 +4799,12 @@ 2 2 2 + + + + + + @@ -4185,6 +4826,8 @@ 2 2 11 + + 1 @@ -4212,6 +4855,12 @@ 2 2 2 + + + + + + @@ -4233,6 +4882,8 @@ 2 2 11 + + 1 @@ -4260,6 +4911,12 @@ 2 2 2 + + + + + + @@ -4281,6 +4938,8 @@ 2 2 11 + + 1 @@ -4308,6 +4967,12 @@ 2 2 2 + + + + + + @@ -4329,6 +4994,8 @@ 2 2 11 + + 1 @@ -4356,6 +5023,12 @@ 2 2 2 + + + + + + @@ -4377,6 +5050,8 @@ 2 2 11 + + 1 @@ -4404,6 +5079,12 @@ 2 2 2 + + + + + + @@ -4425,6 +5106,8 @@ 2 2 11 + + 1 @@ -4452,6 +5135,12 @@ 2 2 2 + + + + + + @@ -4473,6 +5162,8 @@ 2 2 11 + + 1 @@ -4500,6 +5191,12 @@ 2 2 2 + + + + + + @@ -4521,6 +5218,8 @@ 2 2 11 + + 1 @@ -4548,6 +5247,12 @@ 2 2 2 + + + + + + @@ -4569,6 +5274,8 @@ 2 2 11 + + 1 @@ -4596,6 +5303,12 @@ 2 2 2 + + + + + + @@ -4617,6 +5330,8 @@ 2 2 11 + + 1 @@ -4644,6 +5359,12 @@ 2 2 2 + + + + + + @@ -4665,6 +5386,8 @@ 2 2 11 + + 1 @@ -4692,6 +5415,12 @@ 2 2 2 + + + + + + @@ -4713,6 +5442,8 @@ 2 2 11 + + 1 @@ -4740,6 +5471,12 @@ 2 2 2 + + + + + + @@ -4761,6 +5498,8 @@ 2 2 11 + + 1 @@ -4788,6 +5527,12 @@ 2 2 2 + + + + + + @@ -4809,6 +5554,8 @@ 2 2 11 + + 1 @@ -4836,6 +5583,12 @@ 2 2 2 + + + + + + @@ -4857,6 +5610,8 @@ 2 2 11 + + 1 @@ -4884,6 +5639,12 @@ 2 2 2 + + + + + + @@ -4905,6 +5666,8 @@ 2 2 11 + + 1 @@ -4932,6 +5695,12 @@ 2 2 2 + + + + + + @@ -4953,6 +5722,8 @@ 2 2 11 + + 1 @@ -4980,6 +5751,12 @@ 2 2 2 + + + + + + @@ -5001,6 +5778,8 @@ 2 2 11 + + 1 @@ -5028,6 +5807,12 @@ 2 2 2 + + + + + + @@ -5049,6 +5834,8 @@ 2 2 11 + + 1 @@ -5076,6 +5863,12 @@ 2 2 2 + + + + + + @@ -5097,6 +5890,8 @@ 2 2 11 + + 1 @@ -5124,6 +5919,12 @@ 2 2 2 + + + + + + @@ -5145,6 +5946,8 @@ 2 2 11 + + 1 @@ -5172,6 +5975,12 @@ 2 2 2 + + + + + + @@ -5193,6 +6002,8 @@ 2 2 11 + + 1 @@ -5220,6 +6031,12 @@ 2 2 2 + + + + + + @@ -5241,6 +6058,8 @@ 2 2 11 + + 1 @@ -5268,6 +6087,12 @@ 2 2 2 + + + + + + @@ -5289,6 +6114,8 @@ 2 2 11 + + 1 @@ -5316,6 +6143,12 @@ 2 2 2 + + + + + + @@ -5337,6 +6170,8 @@ 2 2 11 + + 1 @@ -5364,6 +6199,12 @@ 2 2 2 + + + + + + @@ -5385,6 +6226,8 @@ 2 2 11 + + 1 @@ -5412,6 +6255,12 @@ 2 2 2 + + + + + + @@ -5433,6 +6282,8 @@ 2 2 11 + + 1 @@ -5460,6 +6311,12 @@ 2 2 2 + + + + + + @@ -5481,6 +6338,8 @@ 2 2 11 + + 1 @@ -5508,6 +6367,12 @@ 2 2 2 + + + + + + @@ -5529,6 +6394,8 @@ 2 2 11 + + 1 @@ -5556,6 +6423,12 @@ 2 2 2 + + + + + + @@ -5577,6 +6450,8 @@ 2 2 11 + + 1 @@ -5604,6 +6479,12 @@ 2 2 2 + + + + + + @@ -5625,6 +6506,8 @@ 2 2 11 + + 1 @@ -5652,6 +6535,12 @@ 2 2 2 + + + + + + @@ -5673,6 +6562,8 @@ 2 2 11 + + 1 @@ -5700,6 +6591,12 @@ 2 2 2 + + + + + + @@ -5721,6 +6618,8 @@ 2 2 11 + + 1 @@ -5748,6 +6647,12 @@ 2 2 2 + + + + + + @@ -5769,6 +6674,8 @@ 2 2 11 + + 1 @@ -5796,6 +6703,12 @@ 2 2 2 + + + + + + @@ -5817,6 +6730,8 @@ 2 2 11 + + 1 @@ -5844,6 +6759,12 @@ 2 2 2 + + + + + + @@ -5865,6 +6786,8 @@ 2 2 11 + + 1 @@ -5892,6 +6815,12 @@ 2 2 2 + + + + + + @@ -5913,6 +6842,8 @@ 2 2 11 + + 1 @@ -5940,6 +6871,12 @@ 2 2 2 + + + + + + @@ -5961,6 +6898,8 @@ 2 2 11 + + 1 @@ -5988,6 +6927,12 @@ 2 2 2 + + + + + + @@ -6009,6 +6954,8 @@ 2 2 11 + + 1 @@ -6036,6 +6983,12 @@ 2 2 2 + + + + + + @@ -6057,6 +7010,8 @@ 2 2 11 + + 1 @@ -6084,6 +7039,12 @@ 2 2 2 + + + + + + @@ -6105,6 +7066,8 @@ 2 2 11 + + 1 @@ -6132,6 +7095,12 @@ 2 2 2 + + + + + + @@ -6153,6 +7122,8 @@ 2 2 11 + + 1 @@ -6180,6 +7151,12 @@ 2 2 2 + + + + + + @@ -6192,17 +7169,18 @@ + - + - + - + - + - + diff --git a/usersrc/encoder.c b/usersrc/encoder.c index 0b6fef8..7f27101 100644 --- a/usersrc/encoder.c +++ b/usersrc/encoder.c @@ -1,27 +1,37 @@ #include "encoder.h" - +#include "zboard.h" #include static int Direction; static int CaptureNumber; +static encoder_t m_uarts[] = { + {&camera_encoder, TIM_CHANNEL_1 | TIM_CHANNEL_2}, // 相机编码器 + {&driven_encoder_gear, TIM_CHANNEL_1 | TIM_CHANNEL_2} // 从动编码器 +}; + void encoder_start(void) { /* 不开启会导致程序无法启动，原因未知 */ - HAL_TIM_Encoder_Start(&htim4, TIM_CHANNEL_1 | TIM_CHANNEL_2); + HAL_TIM_Encoder_Start(&camera_encoder, TIM_CHANNEL_1 | TIM_CHANNEL_2); + HAL_TIM_Encoder_Start(&driven_encoder_gear, TIM_CHANNEL_1 | TIM_CHANNEL_2); } void encoder_stop(void) { - HAL_TIM_Encoder_Stop(&htim4, TIM_CHANNEL_1 | TIM_CHANNEL_2); + HAL_TIM_Encoder_Stop(&camera_encoder, TIM_CHANNEL_1 | TIM_CHANNEL_2); + HAL_TIM_Encoder_Stop(&driven_encoder_gear, TIM_CHANNEL_1 | TIM_CHANNEL_2); } void encoder_read_printf(void) { - Direction = __HAL_TIM_IS_TIM_COUNTING_DOWN(&htim4); // 读取电机转动方向 - CaptureNumber = (short)__HAL_TIM_GET_COUNTER(&htim4); // 读取编码器数据 - __HAL_TIM_GET_COUNTER(&htim4) = 0; // 计数器值重新置位 - if (CaptureNumber != 0) + for (uint8_t i = 0; i < (sizeof(m_uarts) / sizeof(encoder_t)); i++) { - printf("Direction is %d,CaptureNumber is %d\r\n", Direction, CaptureNumber); + Direction = __HAL_TIM_IS_TIM_COUNTING_DOWN(m_uarts[i].tim_handler); // 读取电机转动方向 + CaptureNumber = (short)__HAL_TIM_GET_COUNTER(m_uarts[i].tim_handler); // 读取编码器数据 + __HAL_TIM_GET_COUNTER(m_uarts[i].tim_handler) = 0; // 计数器值重新置位 + if (CaptureNumber != 0) + { + printf("Encoder number:%d,Direction is %d,CaptureNumber is %d\r\n", i, Direction, CaptureNumber); + } } } diff --git a/usersrc/zboard.h b/usersrc/zboard.h index 8e3dd5c..4aad451 100644 --- a/usersrc/zboard.h +++ b/usersrc/zboard.h @@ -14,4 +14,4 @@ * ******************************************************编码器******************************************************* * ***********************************************************************************************************************/ #define camera_encoder htim4 -#define driven_encoder_gear htim8 \ No newline at end of file +#define driven_encoder_gear htim8