From 3d5b3ed59f871e8c7c1c78a4a45278e8acd1ed12 Mon Sep 17 00:00:00 2001 From: tianjialong Date: Tue, 28 Feb 2023 20:09:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8flash=E5=9C=A8=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A=E5=9C=B0=E5=9D=80=E5=86=99=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E7=A8=8B=E5=BA=8F=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E5=90=AF=E5=8A=A8(BUG)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MDK-ARM/LWIP.uvguix.29643 | 19 +++- MDK-ARM/LWIP.uvoptx | 234 ++++++++++++++++++++++++---------------------- MDK-ARM/LWIP.uvprojx | 5 + usersrc/usermain.c | 17 ++++ usersrc/zflash.c | 8 +- usersrc/zflash.h | 2 +- 6 files changed, 165 insertions(+), 120 deletions(-) diff --git a/MDK-ARM/LWIP.uvguix.29643 b/MDK-ARM/LWIP.uvguix.29643 index 385a981..338b24a 100644 --- a/MDK-ARM/LWIP.uvguix.29643 +++ b/MDK-ARM/LWIP.uvguix.29643 @@ -110,8 +110,8 @@ 0 - 396 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000002000000010000000100000052433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C5372635C6672656572746F732E63000000000A6672656572746F732E6300000000C5D4F200FFFFFFFF56433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C757365726D61696E2E63000000000A757365726D61696E2E6300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F0000B1020000 + 506 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000003000000020000000100000052433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C5372635C6672656572746F732E63000000000A6672656572746F732E6300000000C5D4F200FFFFFFFF56433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C757365726D61696E2E63000000000A757365726D61696E2E6300000000FFDC7800FFFFFFFF54433A5C55736572735C32393634335C4465736B746F705C705F6C7573746572696E635F63616D6572615F666F63616C6C656E6774685F656E636F6465725F72657365745C757365727372635C7A666C6173682E6300000000087A666C6173682E6300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000007408000066000000000F0000B1020000 @@ -1806,7 +1806,7 @@ File 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1862,7 +1862,7 @@ 0 100 - 1 + 2 ../Src/freertos.c 44 @@ -1881,6 +1881,15 @@ 0 + + ..\usersrc\zflash.c + 0 + 8 + 40 + 1 + + 0 + diff --git a/MDK-ARM/LWIP.uvoptx b/MDK-ARM/LWIP.uvoptx index 91080f0..83b7932 100644 --- a/MDK-ARM/LWIP.uvoptx +++ b/MDK-ARM/LWIP.uvoptx @@ -336,7 +336,7 @@ usersrc - 0 + 1 0 0 0 @@ -388,6 +388,18 @@ 0 0 + + 3 + 16 + 1 + 0 + 0 + 0 + ..\usersrc\zflash.c + zflash.c + 0 + 0 + @@ -398,7 +410,7 @@ 0 4 - 16 + 17 1 0 0 @@ -418,7 +430,7 @@ 0 5 - 17 + 18 1 0 0 @@ -430,7 +442,7 @@ 5 - 18 + 19 1 0 0 @@ -442,7 +454,7 @@ 5 - 19 + 20 1 0 0 @@ -454,7 +466,7 @@ 5 - 20 + 21 1 0 0 @@ -466,7 +478,7 @@ 5 - 21 + 22 1 0 0 @@ -478,7 +490,7 @@ 5 - 22 + 23 1 0 0 @@ -490,7 +502,7 @@ 5 - 23 + 24 1 0 0 @@ -502,7 +514,7 @@ 5 - 24 + 25 1 0 0 @@ -514,7 +526,7 @@ 5 - 25 + 26 1 0 0 @@ -526,7 +538,7 @@ 5 - 26 + 27 1 0 0 @@ -538,7 +550,7 @@ 5 - 27 + 28 1 0 0 @@ -550,7 +562,7 @@ 5 - 28 + 29 1 0 0 @@ -562,7 +574,7 @@ 5 - 29 + 30 1 0 0 @@ -574,7 +586,7 @@ 5 - 30 + 31 1 0 0 @@ -586,7 +598,7 @@ 5 - 31 + 32 1 0 0 @@ -598,7 +610,7 @@ 5 - 32 + 33 1 0 0 @@ -610,7 +622,7 @@ 5 - 33 + 34 1 0 0 @@ -630,7 +642,7 @@ 0 6 - 34 + 35 1 0 0 @@ -650,7 +662,7 @@ 0 7 - 35 + 36 1 0 0 @@ -662,7 +674,7 @@ 7 - 36 + 37 1 0 0 @@ -674,7 +686,7 @@ 7 - 37 + 38 1 0 0 @@ -686,7 +698,7 @@ 7 - 38 + 39 1 0 0 @@ -698,7 +710,7 @@ 7 - 39 + 40 1 0 0 @@ -710,7 +722,7 @@ 7 - 40 + 41 1 0 0 @@ -722,7 +734,7 @@ 7 - 41 + 42 1 0 0 @@ -734,7 +746,7 @@ 7 - 42 + 43 1 0 0 @@ -746,7 +758,7 @@ 7 - 43 + 44 1 0 0 @@ -758,7 +770,7 @@ 7 - 44 + 45 1 0 0 @@ -778,7 +790,7 @@ 0 8 - 45 + 46 1 0 0 @@ -790,7 +802,7 @@ 8 - 46 + 47 1 0 0 @@ -802,7 +814,7 @@ 8 - 47 + 48 1 0 0 @@ -814,7 +826,7 @@ 8 - 48 + 49 1 0 0 @@ -826,7 +838,7 @@ 8 - 49 + 50 1 0 0 @@ -838,7 +850,7 @@ 8 - 50 + 51 1 0 0 @@ -850,7 +862,7 @@ 8 - 51 + 52 1 0 0 @@ -862,7 +874,7 @@ 8 - 52 + 53 1 0 0 @@ -874,7 +886,7 @@ 8 - 53 + 54 1 0 0 @@ -886,7 +898,7 @@ 8 - 54 + 55 1 0 0 @@ -898,7 +910,7 @@ 8 - 55 + 56 1 0 0 @@ -910,7 +922,7 @@ 8 - 56 + 57 1 0 0 @@ -922,7 +934,7 @@ 8 - 57 + 58 1 0 0 @@ -934,7 +946,7 @@ 8 - 58 + 59 1 0 0 @@ -946,7 +958,7 @@ 8 - 59 + 60 1 0 0 @@ -958,7 +970,7 @@ 8 - 60 + 61 1 0 0 @@ -970,7 +982,7 @@ 8 - 61 + 62 1 0 0 @@ -982,7 +994,7 @@ 8 - 62 + 63 1 0 0 @@ -994,7 +1006,7 @@ 8 - 63 + 64 1 0 0 @@ -1006,7 +1018,7 @@ 8 - 64 + 65 1 0 0 @@ -1018,7 +1030,7 @@ 8 - 65 + 66 1 0 0 @@ -1030,7 +1042,7 @@ 8 - 66 + 67 1 0 0 @@ -1042,7 +1054,7 @@ 8 - 67 + 68 1 0 0 @@ -1054,7 +1066,7 @@ 8 - 68 + 69 1 0 0 @@ -1066,7 +1078,7 @@ 8 - 69 + 70 1 0 0 @@ -1078,7 +1090,7 @@ 8 - 70 + 71 1 0 0 @@ -1090,7 +1102,7 @@ 8 - 71 + 72 1 0 0 @@ -1102,7 +1114,7 @@ 8 - 72 + 73 1 0 0 @@ -1114,7 +1126,7 @@ 8 - 73 + 74 1 0 0 @@ -1126,7 +1138,7 @@ 8 - 74 + 75 1 0 0 @@ -1138,7 +1150,7 @@ 8 - 75 + 76 1 0 0 @@ -1150,7 +1162,7 @@ 8 - 76 + 77 1 0 0 @@ -1162,7 +1174,7 @@ 8 - 77 + 78 1 0 0 @@ -1174,7 +1186,7 @@ 8 - 78 + 79 1 0 0 @@ -1186,7 +1198,7 @@ 8 - 79 + 80 1 0 0 @@ -1198,7 +1210,7 @@ 8 - 80 + 81 1 0 0 @@ -1210,7 +1222,7 @@ 8 - 81 + 82 1 0 0 @@ -1222,7 +1234,7 @@ 8 - 82 + 83 1 0 0 @@ -1234,7 +1246,7 @@ 8 - 83 + 84 1 0 0 @@ -1246,7 +1258,7 @@ 8 - 84 + 85 1 0 0 @@ -1258,7 +1270,7 @@ 8 - 85 + 86 1 0 0 @@ -1270,7 +1282,7 @@ 8 - 86 + 87 1 0 0 @@ -1282,7 +1294,7 @@ 8 - 87 + 88 1 0 0 @@ -1294,7 +1306,7 @@ 8 - 88 + 89 1 0 0 @@ -1306,7 +1318,7 @@ 8 - 89 + 90 1 0 0 @@ -1318,7 +1330,7 @@ 8 - 90 + 91 1 0 0 @@ -1330,7 +1342,7 @@ 8 - 91 + 92 1 0 0 @@ -1342,7 +1354,7 @@ 8 - 92 + 93 1 0 0 @@ -1354,7 +1366,7 @@ 8 - 93 + 94 1 0 0 @@ -1366,7 +1378,7 @@ 8 - 94 + 95 1 0 0 @@ -1378,7 +1390,7 @@ 8 - 95 + 96 1 0 0 @@ -1390,7 +1402,7 @@ 8 - 96 + 97 1 0 0 @@ -1402,7 +1414,7 @@ 8 - 97 + 98 1 0 0 @@ -1414,7 +1426,7 @@ 8 - 98 + 99 1 0 0 @@ -1426,7 +1438,7 @@ 8 - 99 + 100 1 0 0 @@ -1438,7 +1450,7 @@ 8 - 100 + 101 1 0 0 @@ -1450,7 +1462,7 @@ 8 - 101 + 102 1 0 0 @@ -1462,7 +1474,7 @@ 8 - 102 + 103 1 0 0 @@ -1474,7 +1486,7 @@ 8 - 103 + 104 1 0 0 @@ -1486,7 +1498,7 @@ 8 - 104 + 105 1 0 0 @@ -1498,7 +1510,7 @@ 8 - 105 + 106 1 0 0 @@ -1510,7 +1522,7 @@ 8 - 106 + 107 1 0 0 @@ -1522,7 +1534,7 @@ 8 - 107 + 108 1 0 0 @@ -1534,7 +1546,7 @@ 8 - 108 + 109 1 0 0 @@ -1546,7 +1558,7 @@ 8 - 109 + 110 1 0 0 @@ -1558,7 +1570,7 @@ 8 - 110 + 111 1 0 0 @@ -1570,7 +1582,7 @@ 8 - 111 + 112 1 0 0 @@ -1582,7 +1594,7 @@ 8 - 112 + 113 1 0 0 @@ -1594,7 +1606,7 @@ 8 - 113 + 114 1 0 0 @@ -1606,7 +1618,7 @@ 8 - 114 + 115 1 0 0 @@ -1618,7 +1630,7 @@ 8 - 115 + 116 1 0 0 @@ -1630,7 +1642,7 @@ 8 - 116 + 117 1 0 0 @@ -1642,7 +1654,7 @@ 8 - 117 + 118 1 0 0 @@ -1654,7 +1666,7 @@ 8 - 118 + 119 1 0 0 @@ -1666,7 +1678,7 @@ 8 - 119 + 120 1 0 0 @@ -1678,7 +1690,7 @@ 8 - 120 + 121 1 0 0 @@ -1690,7 +1702,7 @@ 8 - 121 + 122 1 0 0 @@ -1702,7 +1714,7 @@ 8 - 122 + 123 1 0 0 @@ -1714,7 +1726,7 @@ 8 - 123 + 124 1 0 0 @@ -1726,7 +1738,7 @@ 8 - 124 + 125 1 0 0 @@ -1738,7 +1750,7 @@ 8 - 125 + 126 1 0 0 diff --git a/MDK-ARM/LWIP.uvprojx b/MDK-ARM/LWIP.uvprojx index 662f637..6134b52 100644 --- a/MDK-ARM/LWIP.uvprojx +++ b/MDK-ARM/LWIP.uvprojx @@ -621,6 +621,11 @@ 1 ..\usersrc\udpclient.c + + zflash.c + 1 + ..\usersrc\zflash.c + diff --git a/usersrc/usermain.c b/usersrc/usermain.c index 75dd422..05b3796 100644 --- a/usersrc/usermain.c +++ b/usersrc/usermain.c @@ -11,6 +11,9 @@ #include "zboard.h" #include "encoder.h" #include "udpclient.h" +#include "zflash.h" + +HAL_StatusTypeDef flash_status; void user_main() { @@ -19,6 +22,20 @@ void user_main() printf("==============ethernet_sound_acquisition_card=============\r\n"); printf("version %d.%d", VERSION_MAIN_ID, VERSION_SUB_ID); + flash_status = FlashErase(); + if (flash_status != HAL_OK) + { + printf("flash erase error, flash_status:%d\r\n", flash_status); + } + + flash_status = FlashWrite(FLASH_START_ADDRESS, 123456); + if (flash_status != HAL_OK) + { + printf("flash write error, flash_status:%d\r\n", flash_status); + } + + printf("flash read data:%d\r\n", FlashRead(FLASH_START_ADDRESS)); + while (1) { udp_client_recv(); diff --git a/usersrc/zflash.c b/usersrc/zflash.c index c3b4cd9..1993587 100644 --- a/usersrc/zflash.c +++ b/usersrc/zflash.c @@ -22,16 +22,18 @@ HAL_StatusTypeDef FlashErase(void) } // 写数据 -void FlashWrite(uint32_t StartAddress, uint32_t data) +HAL_StatusTypeDef FlashWrite(uint32_t StartAddress, uint32_t data) { + HAL_StatusTypeDef status; // 可以添加一些 StartAddress地址 是否有效的判断 HAL_FLASH_Unlock(); // 解锁 - HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, StartAddress, data); + status = HAL_FLASH_Program(FLASH_TYPEPROGRAM_WORD, StartAddress, data); HAL_FLASH_Lock(); // 上锁 + return status; } // 读数据 uint32_t FlashRead(uint32_t StartAddress) { return *(uint32_t *)StartAddress; -} \ No newline at end of file +} diff --git a/usersrc/zflash.h b/usersrc/zflash.h index cbdf29c..633d3ae 100644 --- a/usersrc/zflash.h +++ b/usersrc/zflash.h @@ -4,5 +4,5 @@ #define FLASH_START_ADDRESS 0x08078000 HAL_StatusTypeDef FlashErase(void); -void FlashWrite(uint32_t StartAddress, uint32_t data); +HAL_StatusTypeDef FlashWrite(uint32_t StartAddress, uint32_t data); uint32_t FlashRead(uint32_t StartAddress);