diff --git a/MDK-ARM/VOQC.uvguix.admin b/MDK-ARM/VOQC.uvguix.admin index fba88bf..a40c8fe 100644 --- a/MDK-ARM/VOQC.uvguix.admin +++ b/MDK-ARM/VOQC.uvguix.admin @@ -1822,7 +1822,7 @@ Build 968 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000004564F51439600000000000000010004564F5143000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000004564F51439600000000000000010004564F5143000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3606,27 +3606,27 @@ 0 ../Core/Src/main.c - 0 + 34 75 - 93 + 91 1 0 ..\users\Src\provalctrl.c - 3 - 158 - 250 + 5 + 179 + 178 1 0 ../users/Inc/provalctrl.h - 7 - 49 - 63 + 34 + 1 + 11 1 0 diff --git a/MDK-ARM/VOQC/VOQC.axf b/MDK-ARM/VOQC/VOQC.axf index edca85b..7547240 100644 Binary files a/MDK-ARM/VOQC/VOQC.axf and b/MDK-ARM/VOQC/VOQC.axf differ diff --git a/MDK-ARM/VOQC/VOQC.build_log.htm b/MDK-ARM/VOQC/VOQC.build_log.htm index 3a5fcf4..a845a5a 100644 --- a/MDK-ARM/VOQC/VOQC.build_log.htm +++ b/MDK-ARM/VOQC/VOQC.build_log.htm @@ -29,7 +29,7 @@ Project File Date: 08/26/2024 Build target 'VOQC' compiling provalctrl.c... linking... -Program Size: Code=33582 RO-data=458 RW-data=408 ZI-data=6704 +Program Size: Code=34078 RO-data=458 RW-data=416 ZI-data=6704 FromELF: creating hex file... "VOQC\VOQC.axf" - 0 Error(s), 0 Warning(s). @@ -54,7 +54,7 @@ Package Vendor: Keil

Collection of Component Files used:

* Component: ARM::CMSIS:CORE@5.6.0 -Build Time Elapsed: 00:00:05 +Build Time Elapsed: 00:00:06 diff --git a/MDK-ARM/VOQC/VOQC.hex b/MDK-ARM/VOQC/VOQC.hex index ce4f35c..04a6941 100644 --- a/MDK-ARM/VOQC/VOQC.hex +++ b/MDK-ARM/VOQC/VOQC.hex @@ -1,5 +1,5 @@ :020000040800F2 -:10000000C81B002069020008BB3A000885340008BC +:10000000D01B002069020008BB3A000885340008B4 :10001000713A0008890900089D43000800000000AB :100020000000000000000000000000007D3B000810 :10003000F70A000800000000BF3A00087F3B0008F4 @@ -26,8 +26,8 @@ :10018000830200088302000800F002F800F05CF827 :100190000AA090E8000C82448344AAF10107DA45E2 :1001A00001D100F051F8AFF2090EBAE80F0013F0D8 -:1001B000010F18BFFB1A43F0010318471C8300000E -:1001C0003C8300000A444FF0000C10F8013B13F090 +:1001B000010F18BFFB1A43F0010318470C8500001C +:1001C0002C8500000A444FF0000C10F8013B13F09E :1001D000070408BF10F8014B1D1108BF10F8015BA0 :1001E000641E05D010F8016B641E01F8016BF9D193 :1001F00013F0080F1EBF10F8014BAD1C0C1B09D1EA @@ -35,13 +35,13 @@ :1002100001F8016B6D1EF9D59142D6D370470000ED :100220000023002400250026103A28BF78C1FBD8FF :10023000520728BF30C148BF0B6070471FB508F098 -:1002400035F91FBD10B510BD00F070F91146FFF76C +:100240002DFA1FBD10B510BD00F070F91146FFF773 :10025000F5FF05F003FE00F08EF903B4FFF7F2FF9F :1002600003BC04F049F900000948804709480047E9 :10027000FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE756 :10028000FEE7FEE704480549054A064B70470000B3 -:100290003D3C000889010008C8150020C81B00204B -:1002A000C8170020C81700207047704753EA020C97 +:100290003D3C000889010008D0150020D01B00203B +:1002A000D0170020D01700207047704753EA020C87 :1002B00000F069802DE9F04B4FF00006002B1FBFC6 :1002C000B3FA83F503FA05F424FA05F65E4012BF8B :1002D0001643B2FA82F502FA05F4C5F120051EBFF5 @@ -81,7 +81,7 @@ :1004F000090728BFA0E80C5048BF0CC05DF804EB0A :10050000890028BF40F8042B08BF704748BF20F877 :10051000022B11F0804F18BF00F8012B7047704775 -:100520007047704700487047681500207546FFF710 +:100520007047704700487047701500207546FFF708 :10053000F9FFAE4605006946534620F007008546A0 :1005400018B020B5FFF79EFEBDE820404FF0000632 :100550004FF000074FF000084FF0000B21F00701AB @@ -139,10 +139,10 @@ :100890000846006800F40000F8B108460068C0434C :1008A000086008460068C0F3160008600846006843 :1008B000401C08600846006840420860084600681E -:1008C00007F0A3FB41EC180B9FED120B53EC102B20 -:1008D00007F004FC0B4A03C20DE00D48006807F066 -:1008E00094FB41EC180B9FED0B0B53EC102B07F016 -:1008F000F5FB044A03C2034890ED000B5DE70000DE +:1008C00007F09BFC41EC180B9FED120B53EC102B27 +:1008D00007F0FCFC0B4A03C20DE00D48006807F06E +:1008E0008CFC41EC180B9FED0B0B53EC102B07F01D +:1008F000EDFC044A03C2034890ED000B5DE70000E5 :1009000020000020180000200004024010000020F9 :100910001400002085F90F270088433F70B5044676 :100920000D4600221021164800F036FF0CE0154855 @@ -152,15 +152,15 @@ :10096000ABFA0026304604F0A7FA284604F0A4FAB1 :1009700000221021024800F00FFF00BFE3E7000053 :10098000000402402000002000BFFEE710B502482E -:1009900000F0DCFB10BD00004C06002010B5024842 -:1009A00000F0D4FB10BD00002C05002010B502485B -:1009B00000F0CCFB10BD0000EC05002010B5024893 -:1009C00000F0C4FB10BD0000E001002010B502489B -:1009D00000F0BCFB10BD0000AC06002010B50248C2 -:1009E00000F0B4FB10BD00008C0500200146087823 +:1009900000F0DCFB10BD00005406002010B502483A +:1009A00000F0D4FB10BD00003405002010B5024853 +:1009B00000F0CCFB10BD0000F405002010B502488B +:1009C00000F0C4FB10BD0000E801002010B5024893 +:1009D00000F0BCFB10BD0000B406002010B50248BA +:1009E00000F0B4FB10BD000094050020014608781B :1009F00010381823B0FBF3F20848805CC865032A5E :100A000005D908686FF30900001D886503E00868D0 -:100A10006FF309008865886D70470000B684000890 +:100A10006FF309008865886D70470000A68600089E :100A2000014600208A6A8B69CBB932B1012A0DD008 :100A3000022A03D0032A10D10EE000BFCB6A03F0D4 :100A40008073B3F1807F00D1012007E0CB6AB3F15E @@ -178,7 +178,7 @@ :100B000031FD10BD72B600BFFEE700000146084689 :100B1000024B33F8100002B290B2704786000020FA :100B200001460846024B33F8100002B290B27047FB -:100B3000C809002030B5A0F11002D41702EB54749C +:100B3000D009002030B5A0F11002D41702EB547494 :100B4000E410094D2B5DD41702EB5474E410A2EBB2 :100B5000C4050124AC401C4014B101220A7001E01C :100B600000220A7030BD00007A00002030B5024635 @@ -186,11 +186,11 @@ :100B800002EB5474E410A2EBC4050124AC401C40F9 :100B900014B101220A7001E000220A7030BD000089 :100BA0007F00002010B51648002101600171082166 -:100BB000302006F0D6FD022004F0DEFC092006F00D -:100BC000BFFD0F49C8700A2006F0BAFD0C49087134 -:100BD0000921302006F0C5FD032004F0CDFC0620DD -:100BE00006F0AEFD06490870072006F0A9FD04498D -:100BF0004870082006F0A4FD01498870084610BD21 +:100BB000302006F0CEFE022004F0DEFC092006F014 +:100BC000B7FE0F49C8700A2006F0B2FE0C49087142 +:100BD0000921302006F0BDFE032004F0CDFC0620E4 +:100BE00006F0A6FE06490870072006F0A1FE04499B +:100BF0004870082006F09CFE01498870084610BD28 :100C00006000002038B502460020009000BF92F836 :100C10003C00012801D1022038BD012082F83C00AF :100C200000BF0868092816D91068C0680C780A3C0B @@ -235,7 +235,7 @@ :100E9000C16100210162416200F078FA08B1FFF7F8 :100EA00031FE00BF0648A063846300BF06B010BDDA :100EB0000020014044380240000802401064024013 -:100EC000E0010020F8B504460D46164600200090CB +:100EC000E8010020F8B504460D46164600200090C3 :100ED00000BF94F83C00012801D10220F8BD012098 :100EE00084F83C0000BF2068806800F00100A0B9D1 :100EF0002068806840F001002168886055480068DB @@ -466,13 +466,13 @@ :101D00000D48006820F46040216940EAC1000A499A :101D1000086000F03FF808490968C1F30311074A59 :101D2000515CC8400649086006480068FFF796FE07 -:101D300000204CE7003C024008380240BE84000806 +:101D300000204CE7003C024008380240AE86000814 :101D40000C000020040000200148006870470000DB :101D50000C00002000B5FFF7F7FF04490968C1F344 :101D60008221034A515CC84000BD0000083802408F -:101D7000CE84000800B5FFF7E7FF04490968C1F306 +:101D7000BE86000800B5FFF7E7FF04490968C1F314 :101D80004231034A515CC84000BD0000083802409F -:101D9000CE8400082DE9F047002400250026A14646 +:101D9000BE8600082DE9F047002400250026A14654 :101DA0002548006800F00C0020B1042805D0082860 :101DB0003AD105E0DFF8849039E0DFF8849036E02E :101DC0001D48001F006800F03F041B48001F00680A @@ -693,10 +693,10 @@ :102B300033F806F02000202809D105F020002028D5 :102B400005D1C043216808612046FFF78CFC70BDA9 :102B50007047704710B504460C48844201D104F018 -:102B6000DFFC0B4884420FD16FF00100084909686F +:102B6000D7FD0B4884420FD16FF001000849096876 :102B700008610748FFF79CFD064880880549C88022 -:102B80000020888003F07EFB10BD0000340300208D -:102B90007C0300208C1300207047704770470000B2 +:102B80000020888003F07EFB10BD00003C03002085 +:102B900084030020941300207047704770470000A2 :102BA0002DE9F84F0446206805682068C66820684B :102BB00047694FF00009CA4605F00F09B9F1000F47 :102BC0000AD105F0200038B106F0200020B12046DF @@ -811,9 +811,9 @@ :1032900039FC00BF1548A063846300BF02220121EE :1032A0004720FEF73DFC4720FEF726FC06B010BD88 :1032B000004C004040380240000002407060024074 -:1032C0002C05002000100140B86402408C0500204D -:1032D00000440040EC05002000480040000402408B -:1032E0004C0600200014014000080240AC060020FB +:1032C0003405002000100140B8640240940500203D +:1032D00000440040F4050020004800400004024083 +:1032E000540600200014014000080240B4060020EB :1032F00070B504460D46164694F8420020280BD1BE :1033000005B10EB9012070BD002020633246294668 :10331000204600F08DFFF6E70220F4E710B50446E2 @@ -846,7 +846,7 @@ :1034C00080F830104161FDF767FC08B1FDF71AFB89 :1034D0000A200090012001900320029069460448D0 :1034E000FDF790FB08B1FDF70DFB1FBD002001406B -:1034F000980100200100000F08B500BF00200090D7 +:1034F000A00100200100000F08B500BF00200090CF :103500002648006840F480002449086008460068A6 :1035100000F48000009000BF00BF00BF00200090BA :103520000846006840F4001008600846006800F48F @@ -894,46 +894,46 @@ :1037C000000C024010B50B480B4908600B484860DC :1037D000002109488160C1604FF4804101610021EE :1037E00041618161C1610162FDF7E2FF08B1FDF74E -:1037F00089F910BD0054004040020020A08601005D +:1037F00089F910BD0054004048020020A086010055 :1038000010B50E480E4908604FF4827048600021E0 :103810000B488160C160016141614FF48021816189 :103820000021C1610162416281620A21C162FEF729 :1038300057FD08B1FDF766F910BD000000380040E3 -:103840009402002000B58BB0242102A8FCF740FEB2 +:103840009C02002000B58BB0242102A8FCF740FEAA :103850000020009001901848184908600120486035 :103860000021164881604FF6FF71C160002101619F :1038700041618161032002900020039001200490A7 :1038800000200590069007900120089000200990E4 :103890000A9002A90948FEF72AFF08B1FDF732F99C :1038A00000200090019069460448FEF7DDFD08B154 -:1038B000FDF728F90BB000BD00000140EC0200202C +:1038B000FDF728F90BB000BD00000140F402002024 :1038C0001CB50020009001900E480F49086053205D :1038D000486000210C48816040F2E731C16000215E :1038E0008161FEF71BFE08B1FDF70CF90020009086 :1038F000019069460448FEF7B7FD08B1FDF702F9EB -:103900001CBD000000100040340300201CB5002046 +:103900001CBD0000001000403C0300201CB500203E :10391000009001900E480F49086053204860002134 :103920000C48816040F2E731C16000218161FEF7FF :10393000F5FD08B1FDF7E6F800200090019069461A :103940000448FEF791FD08B1FDF7DCF81CBD00004E -:10395000001400407C03002010B50B480B490860A0 +:10395000001400408403002010B50B480B49086098 :103960004FF4E1304860002108488160C160016186 :103970000C21416100218161C161FFF785FA08B125 -:10398000FDF7C0F810BD0000004C0040C40300204B +:10398000FDF7C0F810BD0000004C0040CC03002043 :1039900010B50B480B4908604FF4E1304860002136 :1039A00008488160C16001610C2141610021816191 :1039B000C161FFF769FA08B1FDF7A4F810BD000076 -:1039C000001001400C04002010B50B480B490860A2 +:1039C000001001401404002010B50B480B4908609A :1039D0004FF4E1304860002108488160C160016116 :1039E0000C21416100218161C161FFF74DFA08B1ED -:1039F000FDF788F810BD000000440040540400208A +:1039F000FDF788F810BD0000004400405C04002082 :103A000010B50B480B4908604FF4E13048600021C5 :103A100008488160C16001610C2141610021816120 :103A2000C161FFF731FA08B1FDF76CF810BD000075 -:103A3000004800409C04002010B50B480B4908606A +:103A300000480040A404002010B50B480B49086062 :103A40004FF4E1304860002108488160C1600161A5 :103A50000C21416100218161C161FFF715FA08B1B4 -:103A6000FDF750F810BD000000140140E4040020F0 +:103A6000FDF750F810BD000000140140EC040020E8 :103A700000BFFEE730B502464FF6FF7012B10446B4 :103A8000A14200D130BD11E012F8014B604000238B :103A90000AE000F0010424B140104AF20104604041 @@ -964,8 +964,8 @@ :103C2000052102A8FDF7CEFF08B1FCF76BFF13B02A :103C300000BD0000403802400070004003480068AA :103C400040F47000014908607047000088ED00E012 -:103C500010B50248FEF7C6FE10BD00003403002078 -:103C600010B50248FEF7BEFE10BD00007C03002028 +:103C500010B50248FEF7C6FE10BD00003C03002070 +:103C600010B50248FEF7BEFE10BD00008403002020 :103C700010B502682D4B98420ED0B0F1804F0BD09A :103C80002B4B984208D02B4B984205D02A4B984298 :103C900002D02A4B984203D122F070024B681A439B @@ -983,7 +983,7 @@ :103D5000001C00400020004030B501F01F05012488 :103D600004FA05F3046A9C430462046A01F01F0527 :103D700002FA05F52C43046230BD000010B502487C -:103D8000FEF70EFF10BD0000C403002070B505460D +:103D8000FEF70EFF10BD0000CC03002070B5054605 :103D9000AC6B0020E085E0842046FEF7FFFE70BD9E :103DA00070B506460025B46B20684069C0F3C015A5 :103DB00094F84100212805D125B10020E084204657 @@ -1077,10 +1077,10 @@ :104330000820606400BF002084F8400000BF012016 :10434000D8E7FFE7206800682840A84201D1012093 :1043500000E00020B842C3D00020CBE710B50248EF -:10436000FEF71EFC10BD00000C04002010B5024832 -:10437000FEF716FC10BD00005404002010B50248E2 -:10438000FEF70EFC10BD00009C04002010B5024892 -:10439000FEF706FC10BD0000E404002000BFFEE7AD +:10436000FEF71EFC10BD00001404002010B502482A +:10437000FEF716FC10BD00005C04002010B50248DA +:10438000FEF70EFC10BD0000A404002010B502488A +:10439000FEF706FC10BD0000EC04002000BFFEE7A5 :1043A0000246024B23F812107047000086000020DE :1043B00070B50A46B2F57F4F19D1A0F11001CC17A4 :1043C00001EB5474E410174D2C5D0B46DD1703EB25 @@ -1105,9 +1105,9 @@ :1044F00000E400E018ED00E000BF7047B5EEC00A30 :10450000F1EE10FA02DBF0EE400A01E0F1EE400AB3 :10451000B0EE600A70470000024800880249088334 -:1045200070470000E8000020C809002010B50122F3 +:1045200070470000E8000020D009002010B50122EB :10453000024801680248FCF7C5FC10BDE8000020F5 -:104540009801002010B52DED068BC848007830B1D9 +:10454000A001002010B52DED068BC848007830B1D1 :10455000012862D002287CD003285DD123E100F03D :104560000FFAC349C14A127841F822000846BF49F0 :10457000097850F8210000EE100AB8EEC00AF0EEFB @@ -1122,16 +1122,16 @@ :10460000A149088200219F4A116051600120974909 :104610000870912000F0D6F924E100F0B1F9944936 :10462000924A127841F82200904A127851F82200FA -:1046300003F0EBFC41EC1A0B9FED940B53EC102BA9 -:1046400003F02EFB41EC190B9FED920B53EC102B5A -:1046500000E049E003F042FD41EC180B03F078FC68 +:1046300003F0E3FD41EC1A0B9FED940B53EC102BB0 +:1046400003F026FC41EC190B9FED920B53EC102B61 +:1046500000E049E003F03AFE41EC180B03F070FD76 :104660008249097801EB8101844A02EBC1018B4A3E :10467000126841F8220089480068401C8749086098 :1046800008460068092801DD00200860002010E0CD :104690007649097801EB8101784A02EBC10151F8B2 :1046A0002010CA17774C18CCC9186241754B06C345 -:1046B000401C0A28ECDB734903C903F0BDFC9FEDE5 -:1046C000780B53EC102B03F0EBFA03F071FC6E49FE +:1046B000401C0A28ECDB734903C903F0B5FD9FEDEC +:1046C000780B53EC102B03F0E3FB03F069FD6E490C :1046D000488200216B4A11605160022063490870D2 :1046E000A12000F06FF9BDE000F04AF960495F4A8F :1046F000127841F8220008465C49097850F82100F8 @@ -1146,10 +1146,10 @@ :104780000A2200233F4903C9FBF707FE3E498882FE :1047900000213C4A11605160032034490870B12067 :1047A00000F010F95EE000F0EBF831492F4A127882 -:1047B00041F822002D4A127851F8220003F025FC1E -:1047C00041EC1A0B9FED310B53EC102B03F068FA00 -:1047D00041EC190B9FED2F0B53EC102B03F07EFCDB -:1047E00041EC180B03F0B4FB2049097801EB81017F +:1047B00041F822002D4A127851F8220003F01DFD25 +:1047C00041EC1A0B9FED310B53EC102B03F060FB07 +:1047D00041EC190B9FED2F0B53EC102B03F076FDE2 +:1047E00041EC180B03F0ACFC2049097801EB810186 :1047F000224A02EBC101294A126841F822002B48E3 :104800000068401C2949086008460068092801DD45 :1048100000200860002010E01449097801EB8101B4 @@ -1158,8 +1158,8 @@ :104840000023104903C9FBF7A8FD0F49C8820021C6 :104850000C4A11605160002004490870812000F06A :10486000B1F800BF00BFBDEC068B10BD38000020C2 -:104870000C0700200000004B00401C461C070020D5 -:104880002800002040000020C8090020000000008F +:10487000140700200000004B00401C4624070020C5 +:104880002800002040000020D00900200000000087 :1048900000006041000000000088A3402C000020C0 :1048A0000000000000002440300000203400002000 :1048B0001FB581200390C02002904020019000206D @@ -1197,57 +1197,57 @@ :104AB00010B52DED0A8BCC480068082835D2DFE808 :104AC00000F004356697C8FCFAF90120FBF760FE98 :104AD000B0EE40CAF0EE60CA9FEDC40B53EC102B51 -:104AE00051EC1C0B03F0FAFA41EC1B0B9FEDC10BD0 -:104AF00053EC102B03F0D4F841EC1A0B9FEDBF0BD5 -:104B000053EC102B03F0E8FB41EC190B9FEDBD0BB0 -:104B100053EC102B03F0C4F841EC180B03F048FAE7 +:104AE00051EC1C0B03F0F2FB41EC1B0B9FEDC10BD7 +:104AF00053EC102B03F0CCF941EC1A0B9FEDBF0BDC +:104B000053EC102B03F0E0FC41EC190B9FEDBD0BB7 +:104B100053EC102B03F0BCF941EC180B03F040FBF5 :104B2000BA4908800120B049086059E10220FBF72A :104B30002FFEB0EE40CAF0EE60CA9FEDAC0B53EC16 -:104B4000102B51EC1C0B03F0C9FA41EC1B0B9FED31 -:104B5000A90B53EC102B03F0A3F841EC1A0B9FEDBB -:104B6000A70B53EC102B03F0B7FB41EC190B9FED97 -:104B7000A50B53EC102B03F093F841EC180B03F04A -:104B800017FAA249488002209749086028E10320CB +:104B4000102B51EC1C0B03F0C1FB41EC1B0B9FED38 +:104B5000A90B53EC102B03F09BF941EC1A0B9FEDC2 +:104B6000A70B53EC102B03F0AFFC41EC190B9FED9E +:104B7000A50B53EC102B03F08BF941EC180B03F051 +:104B80000FFBA249488002209749086028E10320D2 :104B9000FBF7FEFDB0EE40CAF0EE60CA9FED930B4E -:104BA00053EC102B51EC1C0B03F098FA41EC1B0B4F -:104BB0009FED900B53EC102B03F072F841EC1A0BA5 -:104BC0009FED8E0B53EC102B03F086FB41EC190B81 -:104BD0009FED8C0B53EC102B03F062F841EC180B9B -:104BE00003F0E6F98949888003207F490860F7E0EF +:104BA00053EC102B51EC1C0B03F090FB41EC1B0B56 +:104BB0009FED900B53EC102B03F06AF941EC1A0BAC +:104BC0009FED8E0B53EC102B03F07EFC41EC190B88 +:104BD0009FED8C0B53EC102B03F05AF941EC180BA2 +:104BE00003F0DEFA8949888003207F490860F7E0F6 :104BF0000420FBF7CDFDB0EE40CAF0EE60CA9FED99 -:104C00007B0B53EC102B51EC1C0B03F067FA41ECBF -:104C10001B0B9FED780B53EC102B03F041F841EC8C -:104C20001A0B9FED760B53EC102B03F055FB41EC68 -:104C3000190B9FED740B53EC102B03F031F841EC82 -:104C4000180B03F0B5F97149C88004206649086063 +:104C00007B0B53EC102B51EC1C0B03F05FFB41ECC6 +:104C10001B0B9FED780B53EC102B03F039F941EC93 +:104C20001A0B9FED760B53EC102B03F04DFC41EC6F +:104C3000190B9FED740B53EC102B03F029F941EC89 +:104C4000180B03F0ADFA7149C8800420664908606A :104C5000C6E00520FBF79CFDB0EE40CAF0EE60CA4E -:104C60009FED620B53EC102B51EC1C0B03F036FA4A -:104C700041EC1B0B9FED5F0B53EC102B03F010F876 -:104C800041EC1A0B9FED5D0B53EC102B03F024FB52 -:104C900041EC190B9FED5B0B53EC102B03F000F86C -:104CA00041EC180B03F084F95849088105204E495E +:104C60009FED620B53EC102B51EC1C0B03F02EFB51 +:104C700041EC1B0B9FED5F0B53EC102B03F008F97D +:104C800041EC1A0B9FED5D0B53EC102B03F01CFC59 +:104C900041EC190B9FED5B0B53EC102B03F0F8F874 +:104CA00041EC180B03F07CFA5849088105204E4965 :104CB000086095E063E031E0FFE70620FBF768FD60 :104CC000B0EE40CAF0EE60CA9FED480B53EC102BDB -:104CD00051EC1C0B03F002FA41EC1B0B9FED450B52 -:104CE00053EC102B02F0DCFF41EC1A0B9FED430B51 -:104CF00053EC102B03F0F0FA41EC190B9FED410B34 -:104D000053EC102B02F0CCFF41EC180B03F050F9E0 +:104CD00051EC1C0B03F0FAFA41EC1B0B9FED450B5A +:104CE00053EC102B03F0D4F841EC1A0B9FED430B5F +:104CF00053EC102B03F0E8FB41EC190B9FED410B3B +:104D000053EC102B03F0C4F841EC180B03F048FAF5 :104D10003E49488106203449086061E00720FBF7DE :104D200037FDB0EE40CAF0EE60CA9FED300B53EC99 -:104D3000102B51EC1C0B03F0D1F941EC190B9FED3A -:104D40002D0B53EC102B02F0ABFF41EC1B0B9FED36 -:104D50002B0B53EC102B03F0BFFA41EC180B9FED1B -:104D6000290B53EC102B02F09BFF41EC1A0B03F0C4 -:104D70001FF92649888107201B49086030E0002080 +:104D3000102B51EC1C0B03F0C9FA41EC190B9FED41 +:104D40002D0B53EC102B03F0A3F841EC1B0B9FED44 +:104D50002B0B53EC102B03F0B7FB41EC180B9FED22 +:104D6000290B53EC102B03F093F841EC1A0B03F0D2 +:104D700017FA2649888107201B49086030E0002087 :104D8000FBF706FDB0EE40CAF0EE60CA9FED170BD0 -:104D900053EC102B51EC1C0B03F0A0F941EC1B0B56 -:104DA0009FED140B53EC102B02F07AFF41EC1A0B21 -:104DB0009FED120B53EC102B03F08EFA41EC180B05 -:104DC0009FED100B53EC102B02F06AFF41EC190B16 -:104DD00003F0EEF80D49C88100200349086000BFC8 +:104D900053EC102B51EC1C0B03F098FA41EC1B0B5D +:104DA0009FED140B53EC102B03F072F841EC1A0B2F +:104DB0009FED120B53EC102B03F086FB41EC180B0C +:104DC0009FED100B53EC102B03F062F841EC190B24 +:104DD00003F0E6F90D49C88100200349086000BFCF :104DE00000BFBDEC0A8B10BD2400002000000000B5 :104DF000000024403D0AD7A3703DEA3F00000000B8 -:104E000000C06240AE47E17A14AEEF3FC80900200F +:104E000000C06240AE47E17A14AEEF3FD009002007 :104E100010B5002210211148FCF7BEFC0122082128 :104E20000E48FCF7B9FC06210020FBF777FD0821AE :104E30000120FBF773FD00210220FBF76FFDA1218C @@ -1276,12 +1276,12 @@ :104FA00080EE201A8A4890ED000AB4EE401AF1EE25 :104FB00010FA12D08348408800EE100AB8EE400A7A :104FC000DFED810A80EE201A814880ED001A8148C9 -:104FD0007F4991ED000A01F099FF7A48808800EE40 +:104FD0007F4991ED000A02F091F87A48808800EE4E :104FE000100AB8EE400A9FED781AC0EE010A7A481E :104FF00090ED000AF4EE400AF1EE10FA12D071487A :10500000808800EE100AB8EE400ADFED6F0A80EEED :10501000201A714880ED001A70486F4991ED000A1E -:1050200001F074FF6E48C07800F04000402806D1BF +:1050200002F06CF86E48C07800F04000402806D1CD :105030006C480078052802D101206649087068484C :10504000C07800F02000202806D1664800780528A6 :1050500002D10120614908706348006801287CD1B1 @@ -1306,17 +1306,17 @@ :1051800030EE600A80ED130A1E480068012818D12D :1051900000201C4908601248007800F00300032832 :1051A0000FD10E480078012803D01749094801F0B3 -:1051B0003BFD08480078012803D01449074801F056 -:1051C00033FD10BD8600002000007A4468010020F5 -:1051D0006C010020A0130020700100203414002076 -:1051E0007A0000207801002038010020C809002042 -:1051F00000007A460000FA44740100200000614477 -:105200000000C84240010020E014002024150020C6 +:1051B00033FE08480078012803D01449074801F05D +:1051C0002BFE10BD8600002000007A4470010020F4 +:1051D00074010020A8130020780100203C14002056 +:1051E0007A0000208001002038010020D009002032 +:1051F00000007A460000FA447C010020000061446F +:105200000000C84240010020E81400202C150020B6 :1052100010B50F48006801280AD100200C49086029 :1052200000F062FEFFF778F9FFF742FCFFF78AF91A :105230000848006801280AD100200649086000F0EB :10524000ADFA05490880084600880449C88410BDA5 -:10525000F800002010010020EC000020C809002008 +:10525000F800002010010020EC000020D009002000 :1052600010B52DED028BB0EE408A00249FED0C0AA4 :1052700028EE000AB0EE408A9FED0A0A28EE000AE6 :10528000DFED090A80EE201ABCEEC10A10EE100A0A @@ -1446,7 +1446,7 @@ :105A40000120BDE8F08100F0C9F90020F9E700006D :105A500070B504460D4616460C2221460548FFF750 :105A6000B7FF044801682960416869608068A860E0 -:105A700070BD0000D90700202DE9F0470746884691 +:105A700070BD0000E10700202DE9F0470746884689 :105A800091464646002533E015B106F01F0020BBC5 :105A900000F0A4F900240AE000F088F9A02000F04A :105AA0005BF900F0ADF900B904E0601C84B2B4F514 @@ -1460,12 +1460,12 @@ :105B200004E000F05BF90120BDE8F08700F056F9D1 :105B30000020F9E770B504460D4616460548296869 :105B4000016069684160A96881600C222146FFF705 -:105B500093FF70BDCD07002010B53C210E48FCF727 +:105B500093FF70BDD507002010B53C210E48FCF71F :105B6000D5FE49F218700C49096848623C210A4880 :105B7000FCF766FE002009490860094908600949E8 :105B800008609820084908600848C07800F07F0045 -:105B90000649C87010BD0000EC02002088010020FA -:105BA0008C01002090010020940100207A00002048 +:105B90000649C87010BD0000F402002090010020EA +:105BA00094010020980100209C0100207A00002030 :105BB0001C4800681C4908601C480068406A194974 :105BC00008600846006818490968401A1849884260 :105BD00005DA18480068401C164908600DE01148B5 @@ -1473,8 +1473,8 @@ :105BF00010480068401E0F4908600E480068C0EB5E :105C000000400849096808440B49086008460068D4 :105C10004FF6FF7101EA10400849088506480088E0 -:105C2000488570478C01002088010020EC0200208C -:105C3000B03CFFFF9401002090010020C809002023 +:105C2000488570479401002090010020F402002074 +:105C3000B03CFFFF9C01002098010020D00900200B :105C400070B504462546002628E000224FF40041A6 :105C50001448FBF7A1FD05F0800028B10122402186 :105C60001148FBF799FD04E0002240210E48FBF7A4 @@ -1515,9 +1515,9 @@ :105E9000FDF716FDFDF73AFD1248FCF7B5FBFFF7DD :105EA0005BFEFEF743FBFEF7B3FFFEF701FDFFF7D6 :105EB00043FB00F0EDF8FFF7A7FCFEF7B5FA00F0A2 -:105EC00003FAFFF75BFD00F0E5FE00F06BFD07E075 +:105EC00003FAFFF75BFD00F0DDFF00F06FFD07E078 :105ED000FFF78EFBFFF79CF9FFF728F8FFF768FE46 -:105EE000F6E700003403002010B52DED028B9FED86 +:105EE000F6E700003C03002010B52DED028B9FED7E :105EF0005C0AB0EE408AFAF755FE0446207859490C :105F00000860084600680002086060780968084375 :105F1000544908600846006800020860A0780968D3 @@ -1543,30 +1543,30 @@ :106050004FF400710C48FBF79FFBBDEC028B10BDA9 :1060600000000000680000200000004B74000020C9 :1060700000A00C4600401C466C0000205C00002084 -:10608000E80700207800002000080240C80900202E -:1060900010B501F011FA00224FF400712A48FBF705 +:10608000F00700207800002000080240D00900201E +:1060900010B501F009FB00224FF400712A48FBF70C :1060A0007BFB0A20FFF768FA01202849087081214C -:1060B000002001F056FB0A20FFF75EFA0220234978 -:1060C00008708121002001F04CFB0A20FFF754FAF0 -:1060D00003201E4908708121002001F042FB0A20A4 +:1060B000002001F04EFC0A20FFF75EFA022023497F +:1060C00008708121002001F044FC0A20FFF754FAF7 +:1060D00003201E4908708121002001F03AFC0A20AB :1060E000FFF74AFA012251021748FBF755FB0A2035 :1060F000FFF742FA0420154908708121002001F0C1 -:1061000030FB0A20FFF738FA05201049087081217A -:10611000002001F026FB0A20FFF72EFA06200B498B -:1061200008708121002001F01CFB0A20FFF724FAEF +:1061000028FC0A20FFF738FA052010490870812181 +:10611000002001F01EFC0A20FFF72EFA06200B4992 +:1061200008708121002001F014FC0A20FFF724FAF6 :10613000012006490870002241020348FBF72CFBAE :106140000A20FFF719FA10BD000802405C00002089 :106150002DE9F04104460D460CB1022D01DABDE8EF :10616000F08126786778012E01D0002E48D1052FC6 :106170003AD008DC012F0DD0022F11D0032F15D0FB :10618000042F37D118E0062F1CD00F2F20D0102F4E -:1061900030D123E0A81E81B2A01C00F037FF2EE012 -:1061A000A81E81B2A01C00F0D9FF28E0A81E81B271 -:1061B000A01C01F079F822E0A81E81B2A01C01F019 -:1061C000F9F81CE0A81E81B2A01C01F065FC16E0E5 -:1061D000A81E81B2A01C01F0D5FA10E0A81E81B261 -:1061E000A01C01F075FB0AE0A81E81B2A01C01F002 -:1061F000F1FB04E06078012100F004F800BF00BF6B +:1061900030D123E0A81E81B2A01C01F02FF82EE020 +:1061A000A81E81B2A01C01F0D1F828E0A81E81B27F +:1061B000A01C01F071F922E0A81E81B2A01C01F020 +:1061C000F1F91CE0A81E81B2A01C01F05DFD16E0F3 +:1061D000A81E81B2A01C01F0CDFB10E0A81E81B268 +:1061E000A01C01F06DFC0AE0A81E81B2A01C01F009 +:1061F000E9FC04E06078012100F004F800BF00BF72 :1062000000BFACE7F0B599B005460E460024002764 :1062100001222146641C0DF8012045F08002214630 :10622000641C0DF801202146641C0DF80160214614 @@ -1574,45 +1574,45 @@ :1062400001203A122146641C0DF801200B48008AF7 :10625000A04201DB204601E00848008A0749488245 :106260004A8AC8686946FAF7BCF80448428AC16895 -:10627000034801F05BFA19B0F0BD00008C13002058 -:106280000C0400202DE9F04100240E480568C48864 +:10627000034801F053FB19B0F0BD00009413002057 +:10628000140400202DE9F04100240E480568C4885C :10629000022C01DABDE8F081A01E295C601E285C9A :1062A00041EA0027A01E81B22846FDF7E3FB06461F :1062B000B74200D0EEE7034AD1881068FFF748FFE5 -:1062C00000BFE7E78C13002010B50E480E490860A8 +:1062C00000BFE7E79413002010B50E480E490860A0 :1062D00000208880C88008720C48C8604FF4806035 :1062E000088200204882012209490A48FDF700F887 :1062F0006FF001000849096808610748FCF784F954 -:1063000010BD00008C0A00208C1300208C0E002091 -:106310005C0100200C0400207C03002010B518480C +:1063000010BD0000940A002094130020940E002079 +:106310005C010020140400208403002010B51848FC :10632000808840F2FF3188420EDB002014498880CB :1063300008460068002101604FF6FF730A2211A190 :106340001448FCF7F7FF14E0134801780C488288E2 :106350008088401C0A4B98801846006881540F487A :10636000FCF7A6F900200D49096848620B48FCF7C4 :106370004BF9012208490748FCF7BAFF10BD00009D -:106380008C130020E695B0E68DAEE6BAA2E587BA9A -:10639000000000000C0400205C0100207C030020B1 +:1063800094130020E695B0E68DAEE6BAA2E587BA92 +:1063900000000000140400205C01002084030020A1 :1063A00070B504460D46F9480078062874D2DFE837 :1063B00000F0033896FCFBFAF5480068401C40B931 :1063C000F4480068F24908602046B1EE000A00F087 -:1063D0009DFDF0480068F049086008460068EC49F7 +:1063D00095FEF0480068F049086008460068EC49FE :1063E0000968401A14281BDDEC48808C00EE100A66 :1063F000B8EE400AEA48D0ED000A30EE600AF2EE4C :10640000040A80EE201A85ED0E1A4FF0FF30E049A5 :106410000860E1490860DD480078401CDB490870ED -:10642000A3E2DB480068401CA8BBDA480068D849F2 +:10642000A7E2DB480068401CA8BBDA480068D849EE :106430000860D5ED0E0AB0EE001A80EE810A9FEDDD :10644000D91AC0EE010A94ED110A94ED121A30EE39 :10645000411A94ED120A00EE810A85ED0F0A95EDBE :106460000F0AD4ED110AB4EEE00AF1EE10FA02D2EE :1064700095ED0F0A01E094ED110A85ED0F0A95EDF7 :106480000F0AD4ED120AB4EEE00AF1EE10FA04DDC0 -:1064900095ED0F0A03E00BE066E294ED120A85ED3C -:1064A0000F0AD5ED0F0AB0EE600A204600F02EFD6F +:1064900095ED0F0A03E00BE06AE294ED120A85ED38 +:1064A0000F0AD5ED0F0AB0EE600A204600F026FE76 :1064B000B8480068B849086008460068B4490968E7 :1064C000401A0A280ADD4FF0FF30B1490860B2498E -:1064D0000860AE480078401CAC49087045E295F869 +:1064D0000860AE480078401CAC49087049E295F865 :1064E000400005287CDAAA480068401C20B9A94869 :1064F0000068A749086021E095F8401005F1080000 :1065000000EB810090ED000AD4ED0B0AB4EEE00A36 @@ -1625,12 +1625,12 @@ :1065700020EE200AD4ED0B0AB4EEE00AF1EE10FA98 :106580003CDD8948007860BB95ED0F0AD5ED010A26 :10659000B7EE001A70EE810A20EE200A84ED100A90 -:1065A00094ED100A02E0DEE19AE1FFE0D4ED110A79 +:1065A00094ED100A02E0E2E19EE1FFE0D4ED110A71 :1065B000B4EEE00AF1EE10FA02D294ED100A01E016 :1065C00094ED110A84ED100A94ED100AD4ED120A2C :1065D000B4EEE00AF1EE10FA04DD94ED100A03E0E7 :1065E000B0E00BE094ED120A84ED100AD4ED100A2D -:1065F000B0EE600A204600F089FC1AE0D5ED0E0AE4 +:1065F000B0EE600A204600F081FD1AE0D5ED0E0AEB :10660000B0EE001A80EE810AD5ED010AB7EE001A4D :1066100070EE810A20EE200AD4ED0B0AB4EEE00AF7 :10662000F1EE10FA05D86048007810B901205E49F3 @@ -1643,7 +1643,7 @@ :10669000100A01E094ED110A84ED100A94ED100A3D :1066A000D4ED120AB4EEE00AF1EE10FA02DD94ED38 :1066B000100A01E094ED120A84ED100AD4ED100ADC -:1066C000B0EE600A204600F021FC5EE0D5ED0E0A37 +:1066C000B0EE600A204600F019FD5EE0D5ED0E0A3E :1066D000B0EE001A80EE810AD5ED010AB7EE001A7D :1066E00071EE600A20EE200AD4ED0B0AB4EEE00A47 :1066F000F1EE10FA49DB2C480078012845D1002042 @@ -1654,10 +1654,10 @@ :10674000400022E012480068401C18B91148006857 :106750000F4908600F4800680F4908600846006844 :106760000B490968401A06280FDD2046B1EE000AE1 -:1067700000F0CCFB4FF0FF30054908600649086087 -:1067800002480078401C01490870EEE078010020C2 -:106790007C0100205001002080010020C809002059 -:1067A000740100200000614484010020002019E0F1 +:1067700000F0C4FC4FF0FF3005490860064908608E +:1067800002480078401C01490870F2E080010020B6 +:10679000840100205001002088010020D009002041 +:1067A0007C010020000061448C010020002019E0E1 :1067B00095ED070A05F1080101EB8001D1ED000A12 :1067C00030EE200A85ED070A95ED0D0A05F120014E :1067D00001EB8001D1ED000A30EE200A85ED0D0AB3 @@ -1665,469 +1665,500 @@ :1067F00080EE810AD5ED010AB7EE001A70EE810A2B :1068000020EE200AF1EE040A20EE200AD5ED070A58 :1068100080EE801A85ED071A95ED0D0AF1EE040A57 -:1068200080EE201A85ED0D1A95ED070ADFED500A6E -:1068300020EE200ADFED4F0A80EE801A84ED171A51 -:1068400095ED0D0AF6EE000A60EE200A9FED4A1A59 +:1068200080EE201A85ED0D1A95ED070ADFED520A6C +:1068300020EE200ADFED510A80EE801A84ED171A4F +:1068400095ED0D0AF6EE000A60EE200A9FED4C1A57 :1068500080EE810AF2EE040A80EE201A84ED181A06 -:1068600095ED0D0ADFED450A20EE200ADFED420A24 -:1068700080EE201A84ED1D1A6078012802D00228CB -:1068800026D112E094ED170A3D4880ED000A94ED00 -:10689000180A80ED010A94ED1D0A80ED020A032218 -:1068A00001460020FFF746F913E094ED170A34483B -:1068B00080ED000A94ED180A80ED010A94ED1D0A9E -:1068C00080ED020A032201460C20FFF733F900E0B5 -:1068D00000BF00BF2B480078401C2A49087044E0E4 -:1068E00029480068401C18B92848006826490860F3 -:1068F0002648006826490860084600682249096859 -:10690000401A0A282EDD6078012802D0022818D10A -:106910000BE09FED200A204880ED000A1F48C07858 -:1069200000F0BF001D49C8700CE09FED1A0A1C481A -:1069300080ED000A1948C07800F0DF001749C870E0 -:1069400000E000BF00BF4FF0FF300F490860104962 -:10695000086000F027F8002020700A480078401CEA -:106960000849087001E000E070BD00BF00BFFBE710 -:10697000560E494090C2753E00007A448FC2F53DE4 -:10698000C8140020780100207C0100205001002064 -:1069900080010020000000006C0100207A0000202F -:1069A0007001002000202949087000BF11E09FED10 -:1069B000280A2649083101EB800181ED000A9FED8C -:1069C000240A2249203101EB800181ED000A411C9B -:1069D000C8B20528EBDB9FED1F0A1C4880ED010AB9 -:1069E0009FED1B0A80ED0E0A9FED190A80ED0F0A3C -:1069F0000020164981F840001749087000BF11E0D7 -:106A00009FED130A1449083101EB800181ED000A62 -:106A10009FED0F0A1049203101EB800181ED000A42 -:106A2000411CC8B20528EBDB9FED0A0A0A4880ED3D -:106A3000010A9FED070A80ED0E0A9FED050A80ED21 -:106A40000F0A0020044981F840007047E01400203C -:106A5000000000009A99193E2415002010B5044644 -:106A6000D4ED130AB0EE600AFDF748FDD4ED150A27 -:106A7000B4EEE00AF1EE10FA7EDDD4ED130AB0EECA -:106A8000600AFDF73BFDF2EE040AB4EEE00AF1EE17 -:106A900010FA71D294ED1A0AD4ED1C0AB4EEE00A91 -:106AA000F1EE10FA11DB94ED1A0AD4ED1B0AB4EEE4 -:106AB000E00AF1EE10FA08D894ED1A0AD4ED130AA0 -:106AC00030EE200A84ED1A0A0DE094ED1A0AB5EEB4 -:106AD000C00AF1EE10FA02DD94ED1B0A01E094ED1C -:106AE0001C0A84ED1A0A94ED1E0A94ED181AC0EEE1 -:106AF000010A94ED1A0A20EE800A84ED190A94ED39 -:106B00001D0A94ED1E1AC0EE010A94ED130A94EDCD -:106B1000141A30EE410A20EE800A84ED1F0A94ED2B -:106B2000130AD4ED190A30EE200AD4ED1F0A30EE14 -:106B3000200AD4ED170A20EE200A84ED200AD4EDB5 -:106B4000200A9FED381A80EE810AD4ED110A94EDE7 -:106B5000121A70EEC10A20EE200A84ED100A94ED9C -:106B6000130A84ED140A94ED100AD4ED210AB4EE50 -:106B7000E00AF1EE10FA00E052E002D294ED100AC1 -:106B800001E094ED210A84ED100A94ED100AD4ED91 -:106B9000220AB4EEE00AF1EE10FA02DD94ED100ADA -:106BA00001E094ED220A84ED100AD4ED010A94ED7F -:106BB0000A1A70EEC10AB0EE600AFDF79FFCF2EE11 -:106BC000040AB4EEE00AF1EE10FA02D8012084F8CB -:106BD0008C0094ED100AD4ED110AB4EEE00AF1EE47 -:106BE00010FA02D294ED100A01E094ED110A84ED3E -:106BF000100A94ED100AD4ED120AB4EEE00AF1EE98 -:106C000010FA02DD94ED100A01E094ED120A84ED11 -:106C1000100AD4ED100AB0EE600AD4F89000804754 -:106C200010BD00000000C84270B505460C4628782B -:106C300020B101280ED0022825D11BE020780128A0 -:106C400004D1FFF7AFFE0520114908702846FFF771 -:106C500005FF19E00E480078052806D1FFF7A2FECF -:106C60000120207000200A49087021462846FFF7BD -:106C700097FB09E02078012804D1FFF793FE052057 -:106C80000349087000E070BD00BF00BFFBE70000D3 -:106C90007801002010B5032291490020FEF7D8FEAC -:106CA00000209049087001204870002009E09FED05 -:106CB0008E0A8C49091D01EB800181ED000A411CFF -:106CC000C8B20A28F3DB9FED880A864880ED0B0ADC -:106CD0009FED850A80ED0C0A9FED830A80ED0D0A79 -:106CE0009FED810A80ED0E0A9FED7F0A80ED0F0A6D -:106CF0009FED7D0A80ED100AB1EE000A80ED120AC8 -:106D0000B3EE040A80ED110A9FED770A80ED130AB5 -:106D10009FED750A80ED140A9FED740A80ED150A47 -:106D20006F4890ED000A6F4880ED170A6C4890EDAF -:106D3000010AB5EEC00AF1EE10FA02D19FED6C0A1D -:106D400002E0674890ED010A664880ED180A9FED61 -:106D5000660A80ED190A9FED670A80ED1B0A9FED18 -:106D6000660A80ED1C0A9FED600A80ED1A0A5C48F5 -:106D700090ED020A5B4880ED1D0A9FED600A80EDF0 -:106D80001E0A9FED590A80ED1F0A9FED570A80EDFC -:106D9000200A9FED550A80ED210A9FED530A80EDF0 -:106DA000220A00204F4981F88C005548C1F8900014 -:106DB0009FED4D0AD1F890008047032248490C20EE -:106DC000FEF746FE00204F49087002204870002060 -:106DD00009E09FED450A4B49091D01EB800181ED5A -:106DE000000A411CC8B20A28F3DB9FED3F0A454860 -:106DF00080ED0B0A9FED3C0A80ED0C0A9FED3A0AEC -:106E000080ED0D0A9FED380A80ED0E0A9FED360ADF -:106E100080ED0F0A9FED340A80ED100AB1EE000AF2 -:106E200080ED120AB3EE040A80ED110A9FED2E0ADE -:106E300080ED130A9FED2C0A80ED140AB6EE000ACD -:106E400080ED150A264890ED000A2E4880ED170ABD -:106E5000234890ED010AB5EEC00AF1EE10FA02D116 -:106E60009FED230A02E01E4890ED010A254880EDBF -:106E7000180A9FED1D0A80ED190A9FED1E0A80ED8C -:106E80001B0A9FED1D0A80ED1C0A9FED170A80ED7D -:106E90001A0A134890ED020A1A4880ED1D0A9FED68 -:106EA000170A80ED1E0A9FED100A80ED1F0A9FED64 -:106EB0000E0A80ED200A9FED0C0A80ED210A9FED5D -:106EC0000A0A80ED220A00200E4981F88C000E4843 -:106ED000C1F890009FED040AD1F89000804710BDE2 -:106EE000D4140020A0130020000000009A99993EBD -:106EF0000024744900401C4600401CC6CDCC4C3DCB -:106F00006152000834140020AD52000810B52DED78 -:106F1000028BB0EE408A044694ED110AB4EEC80A22 -:106F2000F1EE10FA02DDB0EE480A01E094ED110A2C -:106F3000B0EE408A94ED120AB4EEC80AF1EE10FAEF -:106F400002D2B0EE480A01E094ED120AB0EE408A97 -:106F500094ED110AD4ED120A30EE600AD4ED120A53 -:106F600038EE601AC1EE000A9FED250A20EE800A75 -:106F700084ED0E0A94ED0E0A9FED211AC0EE010A6F -:106F80009FED200A20EE800A84ED0D0A84ED0F8A21 -:106F900094ED0F0A1C48D0ED000AB7EE001A70EE0F -:106FA000810A20EE200A84ED210A94ED0F0AD0ED2B -:106FB000000AB7EE001A71EE600A20EE200A84ED96 -:106FC000220A94ED0F0AD4ED100AB4EEE00AF1EEB5 -:106FD00010FA01DA012000E0002084F8580094ED56 -:106FE0000F0A84ED100A002084F88C00D4ED100AFA -:106FF000B0EE600AD4F890008047BDEC028B10BD63 -:107000000000C84200006144640100202DE9F04FF7 -:107010009DB0054600240020199064216846F9F7C8 -:1070200057FA6878297840EA0129E878A97840EA8F -:107030000126012E01DA282E7EDCB9F1370F7DDC26 -:1070400006EB0900382879DCF01DC11700EB5171FF -:10705000C1F3C7011C9101222046611CCCB20DF87E -:1070600000202046611CCCB20DF800202046621C96 -:10707000D4B21C990DF800100027BB462DE000206B -:107080000DF8040082461AE009EB070188B21BA93B -:10709000F9F750FD1DF804009DF86C1001FA0AF193 -:1070A0000843C0B20DF80400781C87B2B74202DB77 -:1070B0000120199006E00AF1010000F0FF0ABAF180 -:1070C000080FE1DB00BF601CC4B21998012800D191 -:1070D00006E00BF1010000F0FF0B1C988345CEDBAE -:1070E00000BF21466846FCF7C5FC804608F0FF0259 -:1070F0002046611CCCB20DF800204FEA2822204621 -:10710000611CCCB20DF800201248008AA04201DBBD -:10711000204601E00F48008A0E4948824A8AC86822 -:107120006946F9F75EF90B48428AC1680A4800F0DF -:10713000FDFA1DB0BDE8F08F03E0FFE702201A90D2 -:1071400001E003201A9001201A99FFF75BF800BFB5 -:10715000EFE700008C1300200C0400202DE9F04F15 -:107160009DB005460024002019906878297840EAEF -:107170000129E878A97840EA0126012E01DA312EAA -:107180007EDCB9F1300F7FDC06EB090031287BDCB7 -:10719000F01DC11700EB5171C1F3C7011C91012211 -:1071A0002046611CCCB20DF8002002222046611C52 -:1071B000CCB20DF800202046621CD4B21C990DF808 -:1071C00000100027BB462DE000200DF80400824689 -:1071D0001AE009EB070188B21BA9F9F7C7FC1DF8F3 -:1071E00004009DF86C1001FA0AF10843C0B20DF8D2 -:1071F0000400781C87B2B74202DB0120199006E038 -:107200000AF1010000F0FF0ABAF1080FE1DB00BF4C -:10721000601CC4B21998012800D106E00BF10100EE -:1072200000F0FF0B1C988345CEDB00BF214668466B -:10723000FCF720FC804608F0FF022046611CCCB21F -:107240000DF800204FEA28222046611CCCB20DF830 -:1072500000201348008AA04201DB204601E01048CC -:10726000008A0F4948824A8AC8686946F9F7B9F81E -:107270000B48428AC1680B4800F058FA1DB001E083 -:1072800005E001E0BDE8F08F02201A9001E0032044 -:107290001A9002201A99FEF7B5FF00BFEEE7000032 -:1072A0008C1300200C0400202DE9F04F99B0064605 -:1072B000002416B919B0BDE8F08F7078317840EA33 -:1072C0000127F078B17840EA0125012D65DB312DE9 -:1072D00063DC302F5EDC781900285BDB78193128FD -:1072E00058DC01222046611CCCB20DF8002003229C -:1072F0002046611CCCB20DF800206806020E204624 -:10730000611CCCB20DF800204FF0000817E007EB2D -:10731000080188B2F9F7FAFB81464FEA2922204694 -:10732000611CCCB20DF8002009F0FF022046611C60 -:10733000CCB20DF8002008F101001FFA80F8A84532 -:10734000E5DB21466846FCF795FB82460AF0FF0222 -:107350002046611CCCB20DF800204FEA2A222046BC -:10736000611CCCB20DF800201048008AA04201DB5D -:10737000204601E00D48008A0C4948824A8AC868C4 -:107380006946F9F72EF80948428AC168084800F0B2 -:10739000CDF98FE74FF0020B01E04FF0030B594698 -:1073A0000320FEF72FFF00BF84E700008C130020AE -:1073B0000C0400202DE9F04F99B00546002415B9C2 -:1073C00019B0BDE8F08F6878297840EA0127E8789D -:1073D000A97840EA0126012E62DB312E60DC302FD5 -:1073E0005BDCB819312858DC01222046611CCCB284 -:1073F0000DF8002004222046611CCCB20DF80020BC -:107400007006020E2046611CCCB20DF800204FF031 -:10741000000817E007EB080188B2F9F781FB814605 -:107420004FEA29222046611CCCB20DF8002009F059 -:10743000FF022046611CCCB20DF8002008F10100CB -:107440001FFA80F8B045E5DB21466846FCF712FBE1 -:1074500082460AF0FF022046611CCCB20DF80020E3 -:107460004FEA2A222046611CCCB20DF800201048B9 -:10747000008AA04201DB204601E00D48008A0C4949 -:1074800048824A8AC8686946F8F7ABFF0848428ACA -:10749000C168084800F04AF992E74FF0020B01E09A -:1074A0004FF0030B59460420FEF7ACFE00BF87E700 -:1074B0008C1300200C04002010B501221103144885 -:1074C000FAF76AF90122D1021148FAF765F90122A7 -:1074D000D1031048FAF760F900224FF480410D48BB -:1074E000FAF75AF9012280210A48FAF755F90122E0 -:1074F00004210948FAF750F9012211460648FAF723 -:107500004BF9002210210548FAF746F910BD00009A -:10751000000C02400010024000040240000802403B -:1075200068480068401C67490860084600680428ED -:1075300005DD012064490860002062490860634855 -:107540000068401C6149086008460068092805DD9C -:1075500001205F49086000205C4908605D480068C0 -:10756000401C5C49086008460068182805DD0120B9 -:107570005949086000205749086058480068401C75 -:107580005649086008460068312805DD0120544945 -:10759000086000205149086052480068401C514969 -:1075A000086008460068632805DD01204E49086030 -:1075B00000204C4908604D480068401C4B49086059 -:1075C00008460068B0F5967F05DB01204849086051 -:1075D00000204649086047480068401C454908604B -:1075E00008460068B0F5FA7F05DB012042490860D3 -:1075F00000204049086041480068401C3F4908603D -:1076000008460068B0F57A7F05DB01203C49086038 -:1076100000203A4908603B480068B0F5FA7F05DB76 -:107620000120394908600020364908603548006863 -:10763000401C3449086035480068632805DD012096 -:107640003349086000203149086030480068401C18 -:107650002E4908602F480068312805DD01202E4999 -:10766000086000202B4908602A480068401C29490E -:1076700008602A4800681D2805DD012028490860A7 -:1076800000202649086025480068401C23490860FE -:1076900024480068B0F5FA7F0EDB0020214908601D -:1076A00021480068B0F5E15F01DD002002E01E48DE -:1076B0000068401C1C4908601A480068401C1949B1 -:1076C00008607047F4000020F0000020FC0000205B -:1076D000F800002004010020000100200C0100201F -:1076E0000801002014010020100100201C010020CE -:1076F0001801002024010020200100202C0100207E -:107700002801002034010020300100203C0100202D -:107710003801002044010020400100204C010020DD -:1077200048010020540100205001002070B504469B -:107730000D461646324629462046FBF75BFE70BDD5 -:1077400070B50446FDF7ACFE8020FCF7E7F9204653 -:10775000FCF7E4F9FCF7B4F90546FFF7ADFE28465F -:1077600070BD70B505460C46FDF79AFE0020FCF78B -:10777000D5F92846FCF7D2F92046FCF7CFF9FFF7F8 -:107780009BFE70BD2DE9F04F9FB004460025002000 -:107790001B906078217840EA012AE078A17840EADD -:1077A000012620791D90012E7EDB282E7CDC1D9881 -:1077B000C000B0427FDBBAF1370F79DC0AEB06007C -:1077C000382875DC0027A9462FE009F10500205C68 -:1077D0001C904FF0000B1CE0012000FA0BF01C99EC -:1077E000084018B14FF47F401E9001E000201E9029 -:1077F0000AEB070188B21E99FCF7DAFD781C87B204 -:10780000B74202DB01201B9006E00BF1010000F003 -:10781000FF0BBBF1080FDFDB00BF1B98012800D175 -:1078200006E009F1010000F0FF091D988145CCDB5D -:1078300000BF01222846691CCDB201A90A540F22BB -:107840002846691CCDB201A90A5401A82844216820 -:107850000160281DC5B2294601A8FCF70BF9804636 -:107860002846691CCDB201A901F800804FEA282200 -:107870002846691CCDB201A90A541348008AA842BF -:1078800001DB284601E01048008A0F4948824A8AF5 -:10789000C86801A9F8F7A5FD0B48428AC1680B48E2 -:1078A000FFF744FF1FB001E005E001E0BDE8F08F05 -:1078B00002201A9001E003201A900F201A99FEF777 -:1078C000A1FC00BFEEE700008C1300200C04002098 -:1078D0002DE9F04F9BB00446002614B91BB0BDE85B -:1078E000F08F6078217840EA0128E078A17840EABA -:1078F000012794F804B0012F5FDB312F5DDCBBEB77 -:10790000470F5AD1B8F1300F54DC08EB070031288B -:1079100050DC002512E0062000EB4500205C05212C -:1079200001EB4501615C40EA01201A9008EB05017A -:1079300088B21A99FCF734FD681C85B2BD42EADBB7 -:1079400001223046711CCEB201A90A5410223046E1 -:10795000711CCEB201A90A5401A83044216801600B -:10796000301DC6B2314601A8FCF784F88146304686 -:10797000711CCEB201A901F800904FEA29223046CD -:10798000711CCEB201A90A541048008AB04201DB32 -:10799000304601E00D48008A0C4948824A8AC8688E -:1079A00001A9F8F71EFD0948428AC1680848FFF797 -:1079B000BDFE93E74FF0020A01E04FF0030A0AF020 -:1079C000FF011020FEF71EFC00BF87E78C1300208C -:1079D0000C0400202DE9F0479AB005468A460024A1 -:1079E0006878297840EA0129E878A97840EA0127EF -:1079F00017B1B7F57F4F43D1B9F1370F3DDC3946A9 -:107A00004846FCF7D5FC01222046611CCCB201A9F6 -:107A10000A5405222046611CCCB201A90A5401A8CF -:107A2000204429680160201DC4B2214601A8FCF74A -:107A300021F806462046611CCCB201A90E54321230 -:107A40002046611CCCB201A90A541148008AA04208 -:107A500001DB204601E00E48008A0D4948824A8A2F -:107A6000C86801A9F8F7BDFC0948428AC1680948FD -:107A7000FFF75CFE1AB0BDE8F0874FF0020801E0A6 -:107A80004FF0030841460520FEF7BCFB00BFF1E7BD -:107A90008C1300200C0400202DE9F0479AB0054615 -:107AA0008A46002415B91AB0BDE8F08768782978AD -:107AB00040EA0127E878A97840EA0128302F3BDC2A -:107AC00041463846FCF76CFC01222046611CCCB2D2 -:107AD00001A90A5406222046611CCCB201A90A540D -:107AE00001A8204429680160201DC4B2214601A8D4 -:107AF000FBF7C0FF06462046611CCCB201A90E541C -:107B000032122046611CCCB201A90A540E48008AE8 -:107B1000A04201DB204601E00B48008A0A49488266 -:107B20004A8AC86801A9F8F75CFC0748428AC1681C -:107B30000648FFF7FBFDB6E74FF00209494606206D -:107B4000FEF760FB00BFAEE78C1300200C040020A2 -:107B500010B591EA030F48BF83F0004300F1C483DE -:107B6000841A71EB030C05D2121943EB0C03001BB2 -:107B700061EB0C01DFF824E14FEA1154A4EB135C34 -:107B80001EEA430F18BF9EEA445F73D023EA0E0338 -:107B9000DCF1200E21EA045143F4801332D322FA9F -:107BA0000CFE10EB0E0023FA0CFE41EB0E01CCF1A3 -:107BB000200E03FA0EFE10EB0E0051F10001B1F59C -:107BC000801FCCF1200E32D201EB045112FA0EF2DA -:107BD000BDE8104058BF7047401C38BF5FEA420202 -:107BE00018BF7047002814BF20F0010041F10001C8 -:107BF0004FEA410313F5001F38BF7047A1F1C041A0 -:107C000000F064BB012A43EB0302ACF1200CDCF171 -:107C10001F0E32BF4FF0000E23FA0CF310EB0300DF -:107C200041EB0451B4EB115FD0D0A1EB045101F54D -:107C3000801149085FEA300001EB04510ED350F186 -:107C4000000038BF12FA0EFE08D1BDE81040C9E7A7 -:107C5000401C38BF5FEA4202CAD1C3E7BDE810400A -:107C60004FEA410313F5001F38BF7047A1F1C0412F -:107C700000F02CBB9EEA445F08D011EA5E0FBDE81D -:107C8000104004BF01F0004100207047BDE81040E3 -:107C900070B500F0CDFA00BF64FBBE3E0000E0FF0F -:107CA0002DE9C04130B4DFF8A0C23CEA111418BF7E -:107CB0003CEA131400F0EC8081EA03051CEA11147D -:107CC00044EAD57418BF1CEA131500F0C780A4EB72 -:107CD00005044FF0004545EAC12145EAC32341EAC6 -:107CE000505143EA525304F17F74994204F5003431 -:107CF0004FEAC0204FEAC22208BF904200F09C80A9 -:107D00004FEA13650FF24016765D4FEA134506FB06 -:107D100005F7C7F1807706FB07F74FEAD737A7FBD0 -:107D200003687642C8F58038A7FB06CE38BFA8F1B5 -:107D3000010807FB08E64FF0000EA6FB028CE6FBED -:107D400003CEDCF1000CCEF1004E38BFAEF1010ED7 -:107D5000A6FB0C584FF000074FF00005E6FB0E871E -:107D6000A1FB08C6A0FB07CE16EB0E0645F10005E9 -:107D7000E1FB076515F1E04E7EBFA4F580345FEAB4 -:107D800046066D4116F1800745F100054FEA1727B9 -:107D90004FEA066647EA0567A6F1DE46B6F1805F60 -:107DA0004FEA15251FD9384624F0010C05EBC471A4 -:107DB000BCF1FE6F01EB0C1102D8F0BCBDE80081F4 -:107DC00024425CBF01F5801E9EEAC47F02D4F0BC51 -:107DD000BDE80081244238D4F0BCA1F1C041BDE827 -:107DE000004100F073BA4FEAD22242EA43524FEA0E -:107DF000D323A7FB02864FEAD02040EA415007FB7D -:107E000003661EEA0E0F4FEAD12105FB026658BF3A -:107E1000A6EB0056B6EB00564FEA520E4EEAC37E72 -:107E200018EB0E0E56EB530EBDD518EB02085E4153 -:107E30007F1C55F10005B6E74FF480154FF00007A1 -:107E40004FF000064FF00008ADE7F0BC4FF0000027 -:107E500001F1C04101F00041BDE8008111EA0C1FB1 -:107E60000CEA131500D00CE013EA0C1F00F025807B -:107E70004FF00000F0BC81EA030101F00041BDE8D1 -:107E80000081F0BCBDE8004181EA030100F01EBAA8 -:107E9000F0BCBDE8004170B500F0CAF9097EFC3EB7 -:107EA00000F007B881EA03014FF0000001F0004143 -:107EB000704781EA030100F009BAF0BCBDE8004157 -:107EC0004FF0000021497047FFFDFBF9F7F5F4F290 -:107ED000F0EEEDEBE9E8E6E4E3E1E0DEDDDBDAD865 -:107EE000D7D5D4D3D1D0CFCDCCCBCAC8C7C6C5C4C3 -:107EF000C2C1C0BFBEBDBCBBBAB9B8B7B6B5B4B3DA -:107F0000B2B1B0AFAEADACABAAA9A8A8A7A6A5A4C4 -:107F1000A3A3A2A1A09F9F9E9D9C9C9B9A99999888 -:107F20009797969595949393929191908F8F8E8E2B -:107F30008D8C8C8B8B8A89898888878786858584B8 -:107F400084838382828181800000FF070000F87FA4 -:107F50004FEA41034FEA5353A3F58063D3F11E0365 -:107F6000C8BFD3F1210C0CDD4FF0004242EAC12220 -:107F700042EA505232FA03FC8CEAE17CACEBE1704D -:107F80007047102BC4BF0020704703F5787CBCF10C -:107F9000FF3F04D06FF0004282EA2100704770B5C5 -:107FA00000F046F94992248000207047F2E7000073 -:107FB0004FEA1153A3F58063D3F11E03A8BFD3F199 -:107FC000200C08DB4FF0004242EAC12252EA505234 -:107FD00032FA03F0704709420BD4102BC4BF0020C3 -:107FE000704703F5787CBCF1FF3F05D04FF0FF30C0 -:107FF00070474FF00000704770B500F019F900BFEE -:108000004992248000207047F0E710F0004248BFFA -:108010004042B0FA80F310FA03F10AD0C3F11D0315 -:1080200003F580634FEA415002EB035202EBD1218A -:1080300070474FF0000070477FEAE17202D1101ADA -:1080400062EB0101B1FA81F30B3B24D3994012D1C9 -:10805000B0FA80F310FA03F108BF7047C3F11D03B3 -:1080600003F5406303EBC2234FEAD1224FEA4150AC -:1080700002EB03517047C3F1200C20FA0CFC98402E -:10808000C3F1320303F5406303EBC22341EA0C0161 -:1080900001EB0351704710B5C3F1320CC3F100047A -:1080A000C4F1200E0CF5406C0CEBC22201FA0EFC60 -:1080B00021FA04F100FA0EF3E040BDE8104040EA76 -:1080C0000C0001EB025138BF7047401C41F1000128 -:1080D0005B0008BF20F0010070470000DFF848C1D6 -:1080E00070B51CEA111E1EBF1CEA13159EEA0C0F88 -:1080F00095EA0C0F00F06F8081EA030423EA4C1329 -:108100004EEAD47E21EA4C1141F4801143F48013ED -:10811000AE44A1FB024CA0FB0365AEF17F7E361995 -:1081200055EB0C05A1FB034C4CF10003A0FB021C1A -:1081300016EB0C06654153F10003094218BF46F0E7 -:10814000010613F4007F0BD14FEA03314FEA0530EB -:10815000340341EA155140EA16506FF003020AE079 -:108160004FEAC3214FEAC520F40241EA555140EAE3 -:1081700056506FF0020202EB2E4201EB025585EAE7 -:10818000CE710AD05FEA440C18BF24F0004450F1CD -:10819000000041F1000120EAD47040F2FE7C62450B -:1081A00000D270BDA84214BF4FF080444FF040444D -:1081B000002E08BF0024BEF1806FA8BFA1F1C0410E -:1081C000BDE8704080F282804FF0000001F1C041B4 -:1081D00001F0004170479EEA0C0F0CEA131518BF1E -:1081E00095EA0C0F06D04FF0000081EA030E0EF066 -:1081F000004170BD00F01CF88900013E00F007B896 -:1082000000F009B84FEA430C5FEA5C5C08D081EAF1 -:10821000030100F05BB84FEA410C5FEA5C5CF6D109 -:108220004FF00000014970470000FF070000F87F91 -:108230000EF1020E2EF0030E5EF8046B364205D4EA -:10824000012A43EB030515F5001F12D8012841EB65 -:10825000010C1CF5001F0CD80ED14FEAD17C15F58E -:10826000001F0CEB4C0C0CF1020C08BF4CEBD37C48 -:1082700004E04FF0080C01E04FEAD37C0CEB4C0516 -:1082800026FA05F606F00706B6F1040C06D20EEB48 -:10829000860CBDE870404CF0010C6047DFE80CF044 -:1082A000090B02024FF000414FF00000A1F5002140 -:1082B00070BD19461046012851EB010418BFD4F5D2 -:1082C000001484BF002001F0004170BD0808A0F533 -:1082D00000114FEA3101704710B591EA030F48BF12 -:1082E00083F000433FF53CAC841A71EB030C07D2DA -:1082F00012198CF0004C43EB0C03001B61EB0C01DA -:10830000DFF8A4E14FEA1154A4EB135C1EEA430F1B -:1083100018BF9EEA445F00F0B08023EA6E03524229 -:1083200021EA0451C3EB6E0338BF5B1EDCF1200E63 -:1083300025D322FA0CFE10EB0E0043FA0CFE41EBA3 -:108340000E01CCF1200E03FA0EFE10EB0E0051F1DF -:108350000001CCF1200E29D412FA0EF201EB0451E7 -:10836000BDE8104058BF7047401C1CBFB2F1004F21 -:10837000704700280CBF491C20F00100704712EB29 -:10838000020E43EB030218BF4FF0010E4EEA420209 -:10839000ACF1200CDCF11E0E54D943FA0CFE10EBAC -:1083A0000E0051F1FF31CCF11E0ED5D50EF1010EAC -:1083B00012FA0EFE404141EB010101EB445C5FEA21 -:1083C0005C5C10D910EBDE7001EB045138BFBEF1DC -:1083D000004FBDE8104018BF704700280CBF491C73 -:1083E00020F00100704730D24FEAD42C11F5001173 -:1083F00024F400641BD0B1FA81F20B3AA41AA41E33 -:10840000D2F12003914030FA03F31943904001EB7D -:10841000CC71002C01EB0451BDE81040A8BF70479F -:1084200001F1C0414FF0000001F000417047B0FA87 -:1084300080F310FA03F100D110BDE41A173C48058F -:10844000C90AE4E701EB045110BD491001EB0451E6 -:10845000BDE810404FEA300002E04FF000017047E5 -:108460004A0008BF0042F8D0B2F5001F28BF70478D -:1084700001F000414FF0000070479EEA445F07D0D2 -:1084800011EA5E0FBDE8104004BF002100207047D4 -:10849000BDE8104070B5FFF7CBFE00BF40DFF63EF1 -:1084A00083F00041104670470000E0FF4FF040703D -:1084B000E1EE100A704700061016000610160000C4 -:1084C0000000000000000102030406070809000084 -:1084D0000000010203040000F884000800000020EE -:1084E00098010000C40100081885000898010020C8 -:1084F000301A0000200200084132104201034D24CE -:10850000F43954012B02D7640510CDCC4C3D320513 -:088510005AFF0101103298002E +:1068600095ED0D0ADFED470A20EE200ADFED440A20 +:1068700080EE201A84ED1D1A9FED430A84ED1A0A5A +:106880006078012802D0022826D112E094ED170A80 +:106890003E4880ED000A94ED180A80ED010A94ED5F +:1068A0001D0A80ED020A032201460020FFF742F98B +:1068B00013E094ED170A354880ED000A94ED180AAC +:1068C00080ED010A94ED1D0A80ED020A03220146C3 +:1068D0000C20FFF72FF900E000BF00BF2C48007824 +:1068E000401C2B49087044E02A480068401C18B935 +:1068F0002948006827490860274800682749086038 +:106900000846006823490968401A0A282EDD607885 +:10691000012802D0022818D10BE09FED1B0A204865 +:1069200080ED000A1F48C07800F0BF001D49C87004 +:106930000CE09FED150A1C4880ED000A1948C0784C +:1069400000F0DF001749C87000E000BF00BF4FF043 +:10695000FF30104908601149086000F027F8002056 +:1069600020700B480078401C0949087001E000E0E5 +:1069700070BD00BF00BFFBE7560E494090C2753E98 +:1069800000007A448FC2F53D00000000D0140020C2 +:106990008001002084010020500100208801002097 +:1069A000740100207A00002078010020002029498D +:1069B000087000BF11E09FED280A2649083101EB5D +:1069C000800181ED000A9FED240A2249203101EB6C +:1069D000800181ED000A411CC8B20528EBDB9FED68 +:1069E0001F0A1C4880ED010A9FED1B0A80ED0E0A6C +:1069F0009FED190A80ED0F0A0020164981F840002A +:106A00001749087000BF11E09FED130A14490831BF +:106A100001EB800181ED000A9FED0F0A1049203142 +:106A200001EB800181ED000A411CC8B20528EBDBB7 +:106A30009FED0A0A0A4880ED010A9FED070A80EDE2 +:106A40000E0A9FED050A80ED0F0A0020044981F827 +:106A500040007047E8140020000000009A99193E99 +:106A60002C15002010B50446D4ED130AB0EE600AD0 +:106A7000FDF744FDD4ED150AB4EEE00AF1EE10FA8C +:106A80007DDDD4ED130AB0EE600AFDF737FDF2EEBE +:106A9000040AB4EEE00AF1EE10FA70D2D4ED130A53 +:106AA000B0EE600AFDF72AFDF2EE090A30EE200A88 +:106AB000F2EE040A80EE201AD24880ED001AD4EDDE +:106AC000130AB0EE600AFDF719FDF1EE040A30EE8C +:106AD000200AF2EE040A80EE201ACB4880ED001A5C +:106AE00094F8580010B101287ED16AE094ED1A0A9A +:106AF000D4ED1C0AB4EEE00AF1EE10FA14DB94EDCA +:106B00001A0AD4ED1B0AB4EEE00AF1EE10FA0BD823 +:106B100094ED1A0AD4ED130ABA4890ED001A00EE6B +:106B2000810A84ED1A0A0DE094ED1A0AB5EEC00A46 +:106B3000F1EE10FA02DD94ED1B0A01E094ED1C0A5F +:106B400084ED1A0A94ED1E0AD4ED180A80EE201A7C +:106B500094ED1A0A21EE000A84ED190AD4ED1D0AFB +:106B600094ED1E1A80EE810AD4ED130A94ED141AE6 +:106B700070EEC10A20EE200A84ED1F0A00E022E137 +:106B800094ED130AD4ED190A30EE200AD4ED1F0A51 +:106B900030EE200AD4ED170A20EE200A84ED200AF8 +:106BA000D4ED200A9FED991A80EE810AD4ED110AE6 +:106BB00094ED121A70EEC10A20EE200A84ED100A3C +:106BC0006BE094ED1A0AD4ED1C0AB4EEE00AF1EE83 +:106BD00010FA16DB94ED1A0AD4ED1B0AB4EEE00AA3 +:106BE000F1EE10FA0DD800E056E094ED1A0AD4ED5B +:106BF000130A854890ED001A00EE810A84ED1A0A06 +:106C00000DE094ED1A0AB5EEC00AF1EE10FA02DDBD +:106C100094ED1B0A01E094ED1C0A84ED1A0AD4EDF0 +:106C20001E0A94ED181A80EE810AD4ED1A0A20EE9D +:106C3000200A84ED190AD4ED1D0A94ED1E1A80EE87 +:106C4000810AD4ED130A94ED141A70EEC10A20EEF5 +:106C5000200A84ED1F0A94ED130AD4ED190A30EED0 +:106C6000200AD4ED1F0A30EE200AD4ED170A20EED8 +:106C7000200A84ED200AD4ED200A9FED641A80EEEC +:106C8000810AD4ED110A94ED121A70EEC10A20EEB9 +:106C9000200A84ED100A00E000BF00BF94ED130A43 +:106CA00084ED140A94ED100AD4ED210AB4EEE00A42 +:106CB000F1EE10FA02D294ED100A01E094ED210AEF +:106CC00084ED100A94ED100AD4ED220AB4EEE00A25 +:106CD000F1EE10FA02DD94ED100A01E094ED220AC3 +:106CE00084ED100AD4ED010A94ED0A1A70EEC10A7F +:106CF000B0EE600AFDF702FCF2EE040AB4EEE00A20 +:106D0000F1EE10FA02D8012084F88C0094ED100AFC +:106D1000D4ED110AB4EEE00AF1EE10FA02D294EDCD +:106D2000100A01E094ED110A84ED100A94ED100AA6 +:106D3000D4ED120AB4EEE00AF1EE10FA02DD94EDA1 +:106D4000100A01E094ED120A84ED100A94ED0F0A86 +:106D5000D4ED110A9FED2E1A60EE810AB4EEE00A1E +:106D6000F1EE10FA02D294ED100A01E094ED110A4E +:106D700084ED100A94ED0F0AD4ED120A9FED251A46 +:106D800060EE810AB4EEE00AF1EE10FA13D894ED49 +:106D9000120A84ED100AD4ED120A94ED171A80EE4F +:106DA000810AD4ED1E0A94ED181AC0EE811AC0EEC5 +:106DB000210AC4ED1A0AD4ED100AB0EE600AD4F824 +:106DC000900080471CE0D4ED130AB0EE600AFDF796 +:106DD00095FBF2EE040AB4EEE00AF1EE10FA0FDBD6 +:106DE000D4ED100A94ED171A80EE810AD4ED1E0A34 +:106DF00094ED181AC0EE811AC0EE210AC4ED1A0AE9 +:106E000010BD0000680100206C0100200000C84295 +:106E100052B87E3FD7A3803F70B505460C46287810 +:106E200020B101280ED0022825D11BE020780128AE +:106E300004D1FFF7BBFD0520114908702846FFF774 +:106E400011FE19E00E480078052806D1FFF7AEFDC7 +:106E50000120207000200A49087021462846FFF7CB +:106E60009FFA09E02078012804D1FFF79FFD052053 +:106E70000349087000E070BD00BF00BFFBE70000E1 +:106E80008001002010B5032291490020FEF7E0FDAB +:106E900000209049087001204870002009E09FED13 +:106EA0008E0A8C49091D01EB800181ED000A411C0D +:106EB000C8B20A28F3DB9FED880A864880ED0B0AEA +:106EC0009FED850A80ED0C0A9FED830A80ED0D0A87 +:106ED0009FED810A80ED0E0A9FED7F0A80ED0F0A7B +:106EE0009FED7D0A80ED100AB1EE000A80ED120AD6 +:106EF000B3EE040A80ED110A9FED770A80ED130AC4 +:106F00009FED750A80ED140A9FED740A80ED150A55 +:106F10006F4890ED000A6F4880ED170A6C4890EDBD +:106F2000010AB5EEC00AF1EE10FA02D19FED6C0A2B +:106F300002E0674890ED010A664880ED180A9FED6F +:106F4000660A80ED190A9FED670A80ED1B0A9FED26 +:106F5000660A80ED1C0A9FED600A80ED1A0A5C4803 +:106F600090ED020A5B4880ED1D0A9FED600A80EDFE +:106F70001E0A9FED590A80ED1F0A9FED570A80ED0A +:106F8000200A9FED550A80ED210A9FED530A80EDFE +:106F9000220A00204F4981F88C005548C1F8900022 +:106FA0009FED4D0AD1F890008047032248490C20FC +:106FB000FEF74EFD00204F49087002204870002067 +:106FC00009E09FED450A4B49091D01EB800181ED68 +:106FD000000A411CC8B20A28F3DB9FED3F0A45486E +:106FE00080ED0B0A9FED3C0A80ED0C0A9FED3A0AFA +:106FF00080ED0D0A9FED380A80ED0E0A9FED360AEE +:1070000080ED0F0A9FED340A80ED100AB1EE000A00 +:1070100080ED120AB3EE040A80ED110A9FED2E0AEC +:1070200080ED130A9FED2C0A80ED140AB6EE000ADB +:1070300080ED150A264890ED000A2E4880ED170ACB +:10704000234890ED010AB5EEC00AF1EE10FA02D124 +:107050009FED230A02E01E4890ED010A254880EDCD +:10706000180A9FED1D0A80ED190A9FED1E0A80ED9A +:107070001B0A9FED1D0A80ED1C0A9FED170A80ED8B +:107080001A0A134890ED020A1A4880ED1D0A9FED76 +:10709000170A80ED1E0A9FED100A80ED1F0A9FED72 +:1070A0000E0A80ED200A9FED0C0A80ED210A9FED6B +:1070B0000A0A80ED220A00200E4981F88C000E4851 +:1070C000C1F890009FED040AD1F89000804710BDF0 +:1070D000DC140020A8130020000000009A99993EBB +:1070E0000024744900409C4500409CC5CDCC4C3DDB +:1070F000615200083C140020AD52000810B52DED7F +:10710000028BB0EE408A044694ED110AB4EEC80A30 +:10711000F1EE10FA02DDB0EE480A01E094ED110A3A +:10712000B0EE408A94ED120AB4EEC80AF1EE10FAFD +:1071300002D2B0EE480A01E094ED120AB0EE408AA5 +:1071400094ED110AD4ED120A30EE600AD4ED120A61 +:1071500038EE601AC1EE000A9FED250A20EE800A83 +:1071600084ED0E0A94ED0E0A9FED211AC0EE010A7D +:107170009FED200A20EE800A84ED0D0A84ED0F8A2F +:1071800094ED0F0A1C48D0ED000AB7EE001A70EE1D +:10719000810A20EE200A84ED210A94ED0F0AD0ED39 +:1071A000000AB7EE001A71EE600A20EE200A84EDA4 +:1071B000220A94ED0F0AD4ED100AB4EEE00AF1EEC3 +:1071C00010FA01DA012000E0002084F8580094ED64 +:1071D0000F0A84ED100A002084F88C00D4ED100A08 +:1071E000B0EE600AD4F890008047BDEC028B10BD71 +:1071F0000000C84200006144640100202DE9F04F06 +:107200009DB0054600240020199064216846F9F7D6 +:107210005FF96878297840EA0129E878A97840EA96 +:107220000126012E01DA282E7EDCB9F1370F7DDC34 +:1072300006EB0900382879DCF01DC11700EB51710D +:10724000C1F3C7011C9101222046611CCCB20DF88C +:1072500000202046611CCCB20DF800202046621CA4 +:10726000D4B21C990DF800100027BB462DE0002079 +:107270000DF8040082461AE009EB070188B21BA949 +:10728000F9F758FC1DF804009DF86C1001FA0AF19A +:107290000843C0B20DF80400781C87B2B74202DB85 +:1072A0000120199006E00AF1010000F0FF0ABAF18E +:1072B000080FE1DB00BF601CC4B21998012800D19F +:1072C00006E00BF1010000F0FF0B1C988345CEDBBC +:1072D00000BF21466846FCF7CDFB804608F0FF0260 +:1072E0002046611CCCB20DF800204FEA282220462F +:1072F000611CCCB20DF800201248008AA04201DBCC +:10730000204601E00F48008A0E4948824A8AC86830 +:107310006946F9F766F80B48428AC1680A4800F0E6 +:10732000FDFA1DB0BDE8F08F03E0FFE702201A90E0 +:1073300001E003201A9001201A99FEF763FF00BFB5 +:10734000EFE7000094130020140400202DE9F04F13 +:107350009DB005460024002019906878297840EAFD +:107360000129E878A97840EA0126012E01DA312EB8 +:107370007EDCB9F1300F7FDC06EB090031287BDCC5 +:10738000F01DC11700EB5171C1F3C7011C9101221F +:107390002046611CCCB20DF8002002222046611C60 +:1073A000CCB20DF800202046621CD4B21C990DF816 +:1073B00000100027BB462DE000200DF80400824697 +:1073C0001AE009EB070188B21BA9F9F7CFFB1DF8FA +:1073D00004009DF86C1001FA0AF10843C0B20DF8E0 +:1073E0000400781C87B2B74202DB0120199006E046 +:1073F0000AF1010000F0FF0ABAF1080FE1DB00BF5B +:10740000601CC4B21998012800D106E00BF10100FC +:1074100000F0FF0B1C988345CEDB00BF2146684679 +:10742000FCF728FB804608F0FF022046611CCCB226 +:107430000DF800204FEA28222046611CCCB20DF83E +:1074400000201348008AA04201DB204601E01048DA +:10745000008A0F4948824A8AC8686946F8F7C1FF1E +:107460000B48428AC1680B4800F058FA1DB001E091 +:1074700005E001E0BDE8F08F02201A9001E0032052 +:107480001A9002201A99FEF7BDFE00BFEEE7000039 +:1074900094130020140400202DE9F04F99B0064603 +:1074A000002416B919B0BDE8F08F7078317840EA41 +:1074B0000127F078B17840EA0125012D65DB312DF7 +:1074C00063DC302F5EDC781900285BDB781931280B +:1074D00058DC01222046611CCCB20DF800200322AA +:1074E0002046611CCCB20DF800206806020E204632 +:1074F000611CCCB20DF800204FF0000817E007EB3C +:10750000080188B2F9F702FB81464FEA292220469A +:10751000611CCCB20DF8002009F0FF022046611C6E +:10752000CCB20DF8002008F101001FFA80F8A84540 +:10753000E5DB21466846FCF79DFA82460AF0FF0229 +:107540002046611CCCB20DF800204FEA2A222046CA +:10755000611CCCB20DF800201048008AA04201DB6B +:10756000204601E00D48008A0C4948824A8AC868D2 +:107570006946F8F736FF0948428AC168084800F0B2 +:10758000CDF98FE74FF0020B01E04FF0030B5946A6 +:107590000320FEF737FE00BF84E7000094130020AD +:1075A000140400202DE9F04F99B00546002415B9C8 +:1075B00019B0BDE8F08F6878297840EA0127E878AB +:1075C000A97840EA0126012E62DB312E60DC302FE3 +:1075D0005BDCB819312858DC01222046611CCCB292 +:1075E0000DF8002004222046611CCCB20DF80020CA +:1075F0007006020E2046611CCCB20DF800204FF040 +:10760000000817E007EB080188B2F9F789FA81460C +:107610004FEA29222046611CCCB20DF8002009F067 +:10762000FF022046611CCCB20DF8002008F10100D9 +:107630001FFA80F8B045E5DB21466846FCF71AFAE8 +:1076400082460AF0FF022046611CCCB20DF80020F1 +:107650004FEA2A222046611CCCB20DF800201048C7 +:10766000008AA04201DB204601E00D48008A0C4957 +:1076700048824A8AC8686946F8F7B3FE0848428AD1 +:10768000C168084800F04AF992E74FF0020B01E0A8 +:107690004FF0030B59460420FEF7B4FD00BF87E707 +:1076A000941300201404002010B501221103144883 +:1076B000FAF772F80122D1021148FAF76DF80122A7 +:1076C000D1031048FAF768F800224FF480410D48C2 +:1076D000FAF762F8012280210A48FAF75DF80122E0 +:1076E00004210948FAF758F8012211460648FAF72A +:1076F00053F8002210210548FAF74EF810BD00009B +:10770000000C024000100240000402400008024049 +:1077100068480068401C67490860084600680428FB +:1077200005DD012064490860002062490860634863 +:107730000068401C6149086008460068092805DDAA +:1077400001205F49086000205C4908605D480068CE +:10775000401C5C49086008460068182805DD0120C7 +:107760005949086000205749086058480068401C83 +:107770005649086008460068312805DD0120544953 +:10778000086000205149086052480068401C514977 +:10779000086008460068632805DD01204E4908603E +:1077A00000204C4908604D480068401C4B49086067 +:1077B00008460068B0F5967F05DB0120484908605F +:1077C00000204649086047480068401C4549086059 +:1077D00008460068B0F5FA7F05DB012042490860E1 +:1077E00000204049086041480068401C3F4908604B +:1077F00008460068B0F57A7F05DB01203C49086047 +:1078000000203A4908603B480068B0F5FA7F05DB84 +:107810000120394908600020364908603548006871 +:10782000401C3449086035480068632805DD0120A4 +:107830003349086000203149086030480068401C26 +:107840002E4908602F480068312805DD01202E49A7 +:10785000086000202B4908602A480068401C29491C +:1078600008602A4800681D2805DD012028490860B5 +:1078700000202649086025480068401C234908600C +:1078800024480068B0F5FA7F0EDB0020214908602B +:1078900021480068B0F5E15F01DD002002E01E48EC +:1078A0000068401C1C4908601A480068401C1949BF +:1078B00008607047F4000020F0000020FC00002069 +:1078C000F800002004010020000100200C0100202D +:1078D0000801002014010020100100201C010020DC +:1078E0001801002024010020200100202C0100208C +:1078F0002801002034010020300100203C0100203C +:107900003801002044010020400100204C010020EB +:1079100048010020540100205001002070B50446A9 +:107920000D461646324629462046FBF763FD70BDDC +:1079300070B50446FDF7B4FD8020FCF7EFF8204653 +:10794000FCF7ECF8FCF7BCF80546FFF7ADFE28465F +:1079500070BD70B505460C46FDF7A2FD0020FCF792 +:10796000DDF82846FCF7DAF82046FCF7D7F8FFF7F1 +:107970009BFE70BD2DE9F04F9FB00446002500200E +:107980001B906078217840EA012AE078A17840EAEB +:10799000012620791D90012E7EDB282E7CDC1D988F +:1079A000C000B0427FDBBAF1370F79DC0AEB06008A +:1079B000382875DC0027A9462FE009F10500205C76 +:1079C0001C904FF0000B1CE0012000FA0BF01C99FA +:1079D000084018B14FF47F401E9001E000201E9037 +:1079E0000AEB070188B21E99FCF7E2FC781C87B20B +:1079F000B74202DB01201B9006E00BF1010000F012 +:107A0000FF0BBBF1080FDFDB00BF1B98012800D183 +:107A100006E009F1010000F0FF091D988145CCDB6B +:107A200000BF01222846691CCDB201A90A540F22C9 +:107A30002846691CCDB201A90A5401A8284421682E +:107A40000160281DC5B2294601A8FCF713F880463D +:107A50002846691CCDB201A901F800804FEA28220E +:107A60002846691CCDB201A90A541348008AA842CD +:107A700001DB284601E01048008A0F4948824A8A03 +:107A8000C86801A9F8F7ADFC0B48428AC1680B48E9 +:107A9000FFF744FF1FB001E005E001E0BDE8F08F13 +:107AA00002201A9001E003201A900F201A99FEF785 +:107AB000A9FB00BFEEE7000094130020140400208F +:107AC0002DE9F04F9BB00446002614B91BB0BDE869 +:107AD000F08F6078217840EA0128E078A17840EAC8 +:107AE000012794F804B0012F5FDB312F5DDCBBEB85 +:107AF000470F5AD1B8F1300F54DC08EB070031289A +:107B000050DC002512E0062000EB4500205C05213A +:107B100001EB4501615C40EA01201A9008EB050188 +:107B200088B21A99FCF73CFC681C85B2BD42EADBBE +:107B300001223046711CCEB201A90A5410223046EF +:107B4000711CCEB201A90A5401A830442168016019 +:107B5000301DC6B2314601A8FBF78CFF8146304686 +:107B6000711CCEB201A901F800904FEA29223046DB +:107B7000711CCEB201A90A541048008AB04201DB40 +:107B8000304601E00D48008A0C4948824A8AC8689C +:107B900001A9F8F726FC0948428AC1680848FFF79E +:107BA000BDFE93E74FF0020A01E04FF0030A0AF02E +:107BB000FF011020FEF726FB00BF87E7941300208B +:107BC000140400202DE9F0479AB005468A460024A7 +:107BD0006878297840EA0129E878A97840EA0127FD +:107BE00017B1B7F57F4F43D1B9F1370F3DDC3946B7 +:107BF0004846FCF7DDFB01222046611CCCB201A9FE +:107C00000A5405222046611CCCB201A90A5401A8DD +:107C1000204429680160201DC4B2214601A8FBF759 +:107C200029FF06462046611CCCB201A90E5432122F +:107C30002046611CCCB201A90A541148008AA04216 +:107C400001DB204601E00E48008A0D4948824A8A3D +:107C5000C86801A9F8F7C5FB0948428AC168094804 +:107C6000FFF75CFE1AB0BDE8F0874FF0020801E0B4 +:107C70004FF0030841460520FEF7C4FA00BFF1E7C4 +:107C800094130020140400202DE9F0479AB0054613 +:107C90008A46002415B91AB0BDE8F08768782978BB +:107CA00040EA0127E878A97840EA0128302F3BDC38 +:107CB00041463846FCF774FB01222046611CCCB2D9 +:107CC00001A90A5406222046611CCCB201A90A541B +:107CD00001A8204429680160201DC4B2214601A8E2 +:107CE000FBF7C8FE06462046611CCCB201A90E5423 +:107CF00032122046611CCCB201A90A540E48008AF7 +:107D0000A04201DB204601E00B48008A0A49488274 +:107D10004A8AC86801A9F8F764FB0748428AC16823 +:107D20000648FFF7FBFDB6E74FF00209494606207B +:107D3000FEF768FA00BFAEE7941300201404002099 +:107D400010B591EA030F48BF83F0004300F1C483EC +:107D5000841A71EB030C05D2121943EB0C03001BC0 +:107D600061EB0C01DFF824E14FEA1154A4EB135C42 +:107D70001EEA430F18BF9EEA445F73D023EA0E0346 +:107D8000DCF1200E21EA045143F4801332D322FAAD +:107D90000CFE10EB0E0023FA0CFE41EB0E01CCF1B1 +:107DA000200E03FA0EFE10EB0E0051F10001B1F5AA +:107DB000801FCCF1200E32D201EB045112FA0EF2E8 +:107DC000BDE8104058BF7047401C38BF5FEA420210 +:107DD00018BF7047002814BF20F0010041F10001D6 +:107DE0004FEA410313F5001F38BF7047A1F1C041AE +:107DF00000F064BB012A43EB0302ACF1200CDCF180 +:107E00001F0E32BF4FF0000E23FA0CF310EB0300ED +:107E100041EB0451B4EB115FD0D0A1EB045101F55B +:107E2000801149085FEA300001EB04510ED350F194 +:107E3000000038BF12FA0EFE08D1BDE81040C9E7B5 +:107E4000401C38BF5FEA4202CAD1C3E7BDE8104018 +:107E50004FEA410313F5001F38BF7047A1F1C0413D +:107E600000F02CBB9EEA445F08D011EA5E0FBDE82B +:107E7000104004BF01F0004100207047BDE81040F1 +:107E800070B500F0CDFA00BF64FBBE3E0000E0FF1D +:107E90002DE9C04130B4DFF8A0C23CEA111418BF8C +:107EA0003CEA131400F0EC8081EA03051CEA11148B +:107EB00044EAD57418BF1CEA131500F0C780A4EB80 +:107EC00005044FF0004545EAC12145EAC32341EAD4 +:107ED000505143EA525304F17F74994204F500343F +:107EE0004FEAC0204FEAC22208BF904200F09C80B7 +:107EF0004FEA13650FF24016765D4FEA134506FB15 +:107F000005F7C7F1807706FB07F74FEAD737A7FBDE +:107F100003687642C8F58038A7FB06CE38BFA8F1C3 +:107F2000010807FB08E64FF0000EA6FB028CE6FBFB +:107F300003CEDCF1000CCEF1004E38BFAEF1010EE5 +:107F4000A6FB0C584FF000074FF00005E6FB0E872C +:107F5000A1FB08C6A0FB07CE16EB0E0645F10005F7 +:107F6000E1FB076515F1E04E7EBFA4F580345FEAC2 +:107F700046066D4116F1800745F100054FEA1727C7 +:107F80004FEA066647EA0567A6F1DE46B6F1805F6E +:107F90004FEA15251FD9384624F0010C05EBC471B2 +:107FA000BCF1FE6F01EB0C1102D8F0BCBDE8008102 +:107FB00024425CBF01F5801E9EEAC47F02D4F0BC5F +:107FC000BDE80081244238D4F0BCA1F1C041BDE835 +:107FD000004100F073BA4FEAD22242EA43524FEA1C +:107FE000D323A7FB02864FEAD02040EA415007FB8B +:107FF00003661EEA0E0F4FEAD12105FB026658BF49 +:10800000A6EB0056B6EB00564FEA520E4EEAC37E80 +:1080100018EB0E0E56EB530EBDD518EB02085E4161 +:108020007F1C55F10005B6E74FF480154FF00007AF +:108030004FF000064FF00008ADE7F0BC4FF0000035 +:1080400001F1C04101F00041BDE8008111EA0C1FBF +:108050000CEA131500D00CE013EA0C1F00F0258089 +:108060004FF00000F0BC81EA030101F00041BDE8DF +:108070000081F0BCBDE8004181EA030100F01EBAB6 +:10808000F0BCBDE8004170B500F0CAF9097EFC3EC5 +:1080900000F007B881EA03014FF0000001F0004151 +:1080A000704781EA030100F009BAF0BCBDE8004165 +:1080B0004FF0000021497047FFFDFBF9F7F5F4F29E +:1080C000F0EEEDEBE9E8E6E4E3E1E0DEDDDBDAD873 +:1080D000D7D5D4D3D1D0CFCDCCCBCAC8C7C6C5C4D1 +:1080E000C2C1C0BFBEBDBCBBBAB9B8B7B6B5B4B3E8 +:1080F000B2B1B0AFAEADACABAAA9A8A8A7A6A5A4D3 +:10810000A3A3A2A1A09F9F9E9D9C9C9B9A99999896 +:108110009797969595949393929191908F8F8E8E39 +:108120008D8C8C8B8B8A89898888878786858584C6 +:1081300084838382828181800000FF070000F87FB2 +:108140004FEA41034FEA5353A3F58063D3F11E0373 +:10815000C8BFD3F1210C0CDD4FF0004242EAC1222E +:1081600042EA505232FA03FC8CEAE17CACEBE1705B +:108170007047102BC4BF0020704703F5787CBCF11A +:10818000FF3F04D06FF0004282EA2100704770B5D3 +:1081900000F046F94992248000207047F2E7000081 +:1081A0004FEA1153A3F58063D3F11E03A8BFD3F1A7 +:1081B000200C08DB4FF0004242EAC12252EA505242 +:1081C00032FA03F0704709420BD4102BC4BF0020D1 +:1081D000704703F5787CBCF1FF3F05D04FF0FF30CE +:1081E00070474FF00000704770B500F019F900BFFC +:1081F0004992248000207047F0E710F0004248BF09 +:108200004042B0FA80F310FA03F10AD0C3F11D0323 +:1082100003F580634FEA415002EB035202EBD12198 +:1082200070474FF0000070477FEAE17202D1101AE8 +:1082300062EB0101B1FA81F30B3B24D3994012D1D7 +:10824000B0FA80F310FA03F108BF7047C3F11D03C1 +:1082500003F5406303EBC2234FEAD1224FEA4150BA +:1082600002EB03517047C3F1200C20FA0CFC98403C +:10827000C3F1320303F5406303EBC22341EA0C016F +:1082800001EB0351704710B5C3F1320CC3F1000488 +:10829000C4F1200E0CF5406C0CEBC22201FA0EFC6E +:1082A00021FA04F100FA0EF3E040BDE8104040EA84 +:1082B0000C0001EB025138BF7047401C41F1000136 +:1082C0005B0008BF20F0010070470000DFF848C1E4 +:1082D00070B51CEA111E1EBF1CEA13159EEA0C0F96 +:1082E00095EA0C0F00F06F8081EA030423EA4C1337 +:1082F0004EEAD47E21EA4C1141F4801143F48013FC +:10830000AE44A1FB024CA0FB0365AEF17F7E3619A3 +:1083100055EB0C05A1FB034C4CF10003A0FB021C28 +:1083200016EB0C06654153F10003094218BF46F0F5 +:10833000010613F4007F0BD14FEA03314FEA0530F9 +:10834000340341EA155140EA16506FF003020AE087 +:108350004FEAC3214FEAC520F40241EA555140EAF1 +:1083600056506FF0020202EB2E4201EB025585EAF5 +:10837000CE710AD05FEA440C18BF24F0004450F1DB +:10838000000041F1000120EAD47040F2FE7C624519 +:1083900000D270BDA84214BF4FF080444FF040445B +:1083A000002E08BF0024BEF1806FA8BFA1F1C0411C +:1083B000BDE8704080F282804FF0000001F1C041C2 +:1083C00001F0004170479EEA0C0F0CEA131518BF2C +:1083D00095EA0C0F06D04FF0000081EA030E0EF074 +:1083E000004170BD00F01CF88900013E00F007B8A4 +:1083F00000F009B84FEA430C5FEA5C5C08D081EA00 +:10840000030100F05BB84FEA410C5FEA5C5CF6D117 +:108410004FF00000014970470000FF070000F87F9F +:108420000EF1020E2EF0030E5EF8046B364205D4F8 +:10843000012A43EB030515F5001F12D8012841EB73 +:10844000010C1CF5001F0CD80ED14FEAD17C15F59C +:10845000001F0CEB4C0C0CF1020C08BF4CEBD37C56 +:1084600004E04FF0080C01E04FEAD37C0CEB4C0524 +:1084700026FA05F606F00706B6F1040C06D20EEB56 +:10848000860CBDE870404CF0010C6047DFE80CF052 +:10849000090B02024FF000414FF00000A1F500214E +:1084A00070BD19461046012851EB010418BFD4F5E0 +:1084B000001484BF002001F0004170BD0808A0F541 +:1084C00000114FEA3101704710B591EA030F48BF20 +:1084D00083F000433FF53CAC841A71EB030C07D2E8 +:1084E00012198CF0004C43EB0C03001B61EB0C01E8 +:1084F000DFF8A4E14FEA1154A4EB135C1EEA430F2A +:1085000018BF9EEA445F00F0B08023EA6E03524237 +:1085100021EA0451C3EB6E0338BF5B1EDCF1200E71 +:1085200025D322FA0CFE10EB0E0043FA0CFE41EBB1 +:108530000E01CCF1200E03FA0EFE10EB0E0051F1ED +:108540000001CCF1200E29D412FA0EF201EB0451F5 +:10855000BDE8104058BF7047401C1CBFB2F1004F2F +:10856000704700280CBF491C20F00100704712EB37 +:10857000020E43EB030218BF4FF0010E4EEA420217 +:10858000ACF1200CDCF11E0E54D943FA0CFE10EBBA +:108590000E0051F1FF31CCF11E0ED5D50EF1010EBA +:1085A00012FA0EFE404141EB010101EB445C5FEA2F +:1085B0005C5C10D910EBDE7001EB045138BFBEF1EA +:1085C000004FBDE8104018BF704700280CBF491C81 +:1085D00020F00100704730D24FEAD42C11F5001181 +:1085E00024F400641BD0B1FA81F20B3AA41AA41E41 +:1085F000D2F12003914030FA03F31943904001EB8C +:10860000CC71002C01EB0451BDE81040A8BF7047AD +:1086100001F1C0414FF0000001F000417047B0FA95 +:1086200080F310FA03F100D110BDE41A173C48059D +:10863000C90AE4E701EB045110BD491001EB0451F4 +:10864000BDE810404FEA300002E04FF000017047F3 +:108650004A0008BF0042F8D0B2F5001F28BF70479B +:1086600001F000414FF0000070479EEA445F07D0E0 +:1086700011EA5E0FBDE8104004BF002100207047E2 +:10868000BDE8104070B5FFF7CBFE00BF40DFF63EFF +:1086900083F00041104670470000E0FF4FF040704B +:1086A000E1EE100A704700061016000610160000D2 +:1086B0000000000000000102030406070809000092 +:1086C0000000010203040000E8860008000000200A +:1086D000A0010000C401000808870008A0010020D4 +:1086E000301A0000200200084132104201034D24DC +:1086F000F43954012B02D7640518CDCC4C3D32051A +:088700005AFF0101103298003C :040000050800018965 :00000001FF diff --git a/MDK-ARM/VOQC/VOQC.htm b/MDK-ARM/VOQC/VOQC.htm index 36a2d80..2d5031c 100644 --- a/MDK-ARM/VOQC/VOQC.htm +++ b/MDK-ARM/VOQC/VOQC.htm @@ -3,7 +3,7 @@ Static Call Graph - [VOQC\VOQC.axf]

Static Call Graph for image VOQC\VOQC.axf

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Sep 02 09:41:59 2024 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Fri Sep 06 15:37:49 2024

Maximum Stack Usage = 452 bytes + Unknown(Functions without stacksize, Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

@@ -2179,7 +2179,7 @@ Global Symbols
[Called By]
  • >>   HAL_UART_RxCpltCallback
-

prov_adj (Thumb, 1488 bytes, Stack size 16 bytes, provalctrl.o(i.prov_adj)) +

prov_adj (Thumb, 1496 bytes, Stack size 16 bytes, provalctrl.o(i.prov_adj))

[Stack]

  • Max Depth = 80
  • Call Chain = prov_adj ⇒ ee_writefloats ⇒ ee_writebytes ⇒ i2c_sendbyte

[Calls]
  • >>   prov_adj_init @@ -2195,7 +2195,7 @@ Global Symbols
  • >>   prov_adj
-

prov_calibrate_pid (Thumb, 454 bytes, Stack size 8 bytes, provalctrl.o(i.prov_calibrate_pid)) +

prov_calibrate_pid (Thumb, 926 bytes, Stack size 8 bytes, provalctrl.o(i.prov_calibrate_pid))

[Stack]

  • Max Depth = 8
  • Call Chain = prov_calibrate_pid

[Calls]
  • >>   abs_bias @@ -2447,18 +2447,18 @@ Global Symbols

__fpl_dnaninf (Thumb, 156 bytes, Stack size 16 bytes, dnaninf.o(x$fpl$dnaninf), UNUSED) -

[Called By]

  • >>   _ddiv -
  • >>   _dsub +

    [Called By]
    • >>   _dsub
    • >>   _dadd
    • >>   _dmul
    • >>   _dfixu
    • >>   _dfix +
    • >>   _ddiv

    __fpl_dretinf (Thumb, 12 bytes, Stack size 0 bytes, dretinf.o(x$fpl$dretinf), UNUSED) -

    [Called By]

    • >>   _ddiv -
    • >>   _dadd +

      [Called By]
      • >>   _dadd
      • >>   _dmul +
      • >>   _ddiv

      __aeabi_dsub (Thumb, 0 bytes, Stack size 32 bytes, daddsub_clz.o(x$fpl$dsub)) diff --git a/MDK-ARM/VOQC/VOQC.map b/MDK-ARM/VOQC/VOQC.map index e36b17f..4c778de 100644 --- a/MDK-ARM/VOQC/VOQC.map +++ b/MDK-ARM/VOQC/VOQC.map @@ -1565,6 +1565,7 @@ Section Cross References provalctrl.o(i.prov_adj) refers to modbus.o(.data) for CoilState provalctrl.o(i.prov_adj_init) refers to provalctrl.o(.bss) for adj_pv1 provalctrl.o(i.prov_calibrate_pid) refers to provalctrl.o(i.abs_bias) for abs_bias + provalctrl.o(i.prov_calibrate_pid) refers to provalctrl.o(.data) for beta_in provalctrl.o(i.prov_ctrl) refers to provalctrl.o(i.prov_adj_init) for prov_adj_init provalctrl.o(i.prov_ctrl) refers to provalctrl.o(i.prov_calibrate_pid) for prov_calibrate_pid provalctrl.o(i.prov_ctrl) refers to provalctrl.o(i.prov_adj) for prov_adj @@ -3178,53 +3179,53 @@ Image Symbol Table i.modbus_rtu_init 0x080062c8 Section 0 modbus_rtu.o(i.modbus_rtu_init) i.modbus_rx_cb 0x0800631c Section 0 modbus_rtu.o(i.modbus_rx_cb) i.prov_adj 0x080063a0 Section 0 provalctrl.o(i.prov_adj) - i.prov_adj_init 0x080069a4 Section 0 provalctrl.o(i.prov_adj_init) - i.prov_calibrate_pid 0x08006a5c Section 0 provalctrl.o(i.prov_calibrate_pid) - i.prov_ctrl 0x08006c28 Section 0 provalctrl.o(i.prov_ctrl) - i.prov_init 0x08006c94 Section 0 provalctrl.o(i.prov_init) - i.prov_set 0x08006f0c Section 0 provalctrl.o(i.prov_set) - i.readcoilstate_rtu 0x0800700c Section 0 modbus_rtu.o(i.readcoilstate_rtu) - i.readdisinputstate_rtu 0x0800715c Section 0 modbus_rtu.o(i.readdisinputstate_rtu) - i.readholdreg_rtu 0x080072a8 Section 0 modbus_rtu.o(i.readholdreg_rtu) - i.readinputreg_rtu 0x080073b4 Section 0 modbus_rtu.o(i.readinputreg_rtu) - i.setcs 0x080074b8 Section 0 ms5803.o(i.setcs) - i.tim6_cnt 0x08007520 Section 0 timer.o(i.tim6_cnt) - i.uart_send 0x0800772c Section 0 uarts.o(i.uart_send) - i.wf5803_ReadReg 0x08007740 Section 0 mf5803.o(i.wf5803_ReadReg) - i.wf5803_WriteReg 0x08007762 Section 0 mf5803.o(i.wf5803_WriteReg) - i.writemulticoil_rtu 0x08007784 Section 0 modbus_rtu.o(i.writemulticoil_rtu) - i.writemultireg_rtu 0x080078d0 Section 0 modbus_rtu.o(i.writemultireg_rtu) - i.writesinglecoil_rtu 0x080079d4 Section 0 modbus_rtu.o(i.writesinglecoil_rtu) - i.writesinglereg_rtu 0x08007a98 Section 0 modbus_rtu.o(i.writesinglereg_rtu) - x$fpl$dadd 0x08007b50 Section 336 daddsub_clz.o(x$fpl$dadd) - $v0 0x08007b50 Number 0 daddsub_clz.o(x$fpl$dadd) - _dadd1 0x08007b61 Thumb Code 0 daddsub_clz.o(x$fpl$dadd) - x$fpl$ddiv 0x08007ca0 Section 688 ddiv.o(x$fpl$ddiv) - $v0 0x08007ca0 Number 0 ddiv.o(x$fpl$ddiv) - ddiv_entry 0x08007ca7 Thumb Code 0 ddiv.o(x$fpl$ddiv) - x$fpl$dfix 0x08007f50 Section 94 dfix.o(x$fpl$dfix) - $v0 0x08007f50 Number 0 dfix.o(x$fpl$dfix) - x$fpl$dfixu 0x08007fb0 Section 90 dfixu.o(x$fpl$dfixu) - $v0 0x08007fb0 Number 0 dfixu.o(x$fpl$dfixu) - x$fpl$dflt 0x0800800a Section 46 dflt_clz.o(x$fpl$dflt) - $v0 0x0800800a Number 0 dflt_clz.o(x$fpl$dflt) - x$fpl$dfltll 0x08008038 Section 162 dfltll_clz.o(x$fpl$dfltll) - $v0 0x08008038 Number 0 dfltll_clz.o(x$fpl$dfltll) - x$fpl$dmul 0x080080dc Section 340 dmul.o(x$fpl$dmul) - $v0 0x080080dc Number 0 dmul.o(x$fpl$dmul) - x$fpl$dnaninf 0x08008230 Section 156 dnaninf.o(x$fpl$dnaninf) - $v0 0x08008230 Number 0 dnaninf.o(x$fpl$dnaninf) - x$fpl$dretinf 0x080082cc Section 12 dretinf.o(x$fpl$dretinf) - $v0 0x080082cc Number 0 dretinf.o(x$fpl$dretinf) - x$fpl$dsub 0x080082d8 Section 468 daddsub_clz.o(x$fpl$dsub) - $v0 0x080082d8 Number 0 daddsub_clz.o(x$fpl$dsub) - _dsub1 0x080082e9 Thumb Code 0 daddsub_clz.o(x$fpl$dsub) - x$fpl$fpinit 0x080084ac Section 10 fpinit.o(x$fpl$fpinit) - $v0 0x080084ac Number 0 fpinit.o(x$fpl$fpinit) - .constdata 0x080084b6 Section 8 stm32f4xx_hal_dma.o(.constdata) - x$fpl$usenofp 0x080084b6 Section 0 usenofp.o(x$fpl$usenofp) - flagBitshiftOffset 0x080084b6 Data 8 stm32f4xx_hal_dma.o(.constdata) - .constdata 0x080084be Section 24 system_stm32f4xx.o(.constdata) + i.prov_adj_init 0x080069ac Section 0 provalctrl.o(i.prov_adj_init) + i.prov_calibrate_pid 0x08006a64 Section 0 provalctrl.o(i.prov_calibrate_pid) + i.prov_ctrl 0x08006e18 Section 0 provalctrl.o(i.prov_ctrl) + i.prov_init 0x08006e84 Section 0 provalctrl.o(i.prov_init) + i.prov_set 0x080070fc Section 0 provalctrl.o(i.prov_set) + i.readcoilstate_rtu 0x080071fc Section 0 modbus_rtu.o(i.readcoilstate_rtu) + i.readdisinputstate_rtu 0x0800734c Section 0 modbus_rtu.o(i.readdisinputstate_rtu) + i.readholdreg_rtu 0x08007498 Section 0 modbus_rtu.o(i.readholdreg_rtu) + i.readinputreg_rtu 0x080075a4 Section 0 modbus_rtu.o(i.readinputreg_rtu) + i.setcs 0x080076a8 Section 0 ms5803.o(i.setcs) + i.tim6_cnt 0x08007710 Section 0 timer.o(i.tim6_cnt) + i.uart_send 0x0800791c Section 0 uarts.o(i.uart_send) + i.wf5803_ReadReg 0x08007930 Section 0 mf5803.o(i.wf5803_ReadReg) + i.wf5803_WriteReg 0x08007952 Section 0 mf5803.o(i.wf5803_WriteReg) + i.writemulticoil_rtu 0x08007974 Section 0 modbus_rtu.o(i.writemulticoil_rtu) + i.writemultireg_rtu 0x08007ac0 Section 0 modbus_rtu.o(i.writemultireg_rtu) + i.writesinglecoil_rtu 0x08007bc4 Section 0 modbus_rtu.o(i.writesinglecoil_rtu) + i.writesinglereg_rtu 0x08007c88 Section 0 modbus_rtu.o(i.writesinglereg_rtu) + x$fpl$dadd 0x08007d40 Section 336 daddsub_clz.o(x$fpl$dadd) + $v0 0x08007d40 Number 0 daddsub_clz.o(x$fpl$dadd) + _dadd1 0x08007d51 Thumb Code 0 daddsub_clz.o(x$fpl$dadd) + x$fpl$ddiv 0x08007e90 Section 688 ddiv.o(x$fpl$ddiv) + $v0 0x08007e90 Number 0 ddiv.o(x$fpl$ddiv) + ddiv_entry 0x08007e97 Thumb Code 0 ddiv.o(x$fpl$ddiv) + x$fpl$dfix 0x08008140 Section 94 dfix.o(x$fpl$dfix) + $v0 0x08008140 Number 0 dfix.o(x$fpl$dfix) + x$fpl$dfixu 0x080081a0 Section 90 dfixu.o(x$fpl$dfixu) + $v0 0x080081a0 Number 0 dfixu.o(x$fpl$dfixu) + x$fpl$dflt 0x080081fa Section 46 dflt_clz.o(x$fpl$dflt) + $v0 0x080081fa Number 0 dflt_clz.o(x$fpl$dflt) + x$fpl$dfltll 0x08008228 Section 162 dfltll_clz.o(x$fpl$dfltll) + $v0 0x08008228 Number 0 dfltll_clz.o(x$fpl$dfltll) + x$fpl$dmul 0x080082cc Section 340 dmul.o(x$fpl$dmul) + $v0 0x080082cc Number 0 dmul.o(x$fpl$dmul) + x$fpl$dnaninf 0x08008420 Section 156 dnaninf.o(x$fpl$dnaninf) + $v0 0x08008420 Number 0 dnaninf.o(x$fpl$dnaninf) + x$fpl$dretinf 0x080084bc Section 12 dretinf.o(x$fpl$dretinf) + $v0 0x080084bc Number 0 dretinf.o(x$fpl$dretinf) + x$fpl$dsub 0x080084c8 Section 468 daddsub_clz.o(x$fpl$dsub) + $v0 0x080084c8 Number 0 daddsub_clz.o(x$fpl$dsub) + _dsub1 0x080084d9 Thumb Code 0 daddsub_clz.o(x$fpl$dsub) + x$fpl$fpinit 0x0800869c Section 10 fpinit.o(x$fpl$fpinit) + $v0 0x0800869c Number 0 fpinit.o(x$fpl$fpinit) + .constdata 0x080086a6 Section 8 stm32f4xx_hal_dma.o(.constdata) + x$fpl$usenofp 0x080086a6 Section 0 usenofp.o(x$fpl$usenofp) + flagBitshiftOffset 0x080086a6 Data 8 stm32f4xx_hal_dma.o(.constdata) + .constdata 0x080086ae Section 24 system_stm32f4xx.o(.constdata) .data 0x20000000 Section 9 stm32f4xx_hal.o(.data) .data 0x2000000c Section 4 system_stm32f4xx.o(.data) .data 0x20000010 Section 24 ads1256.o(.data) @@ -3237,26 +3238,26 @@ Image Symbol Table .data 0x200000ee Section 2 gpios.o(.data) .data 0x200000f0 Section 105 timer.o(.data) .data 0x2000015c Section 8 uarts.o(.data) - .data 0x20000164 Section 33 provalctrl.o(.data) - .data 0x20000188 Section 16 encoder.o(.data) - .bss 0x20000198 Section 168 adc.o(.bss) - .bss 0x20000240 Section 84 i2c.o(.bss) - .bss 0x20000294 Section 88 spi.o(.bss) - .bss 0x200002ec Section 216 tim.o(.bss) - .bss 0x200003c4 Section 840 usart.o(.bss) - .bss 0x2000070c Section 176 ads1220.o(.bss) - .bss 0x200007bc Section 41 eeprom.o(.bss) - .bss 0x200007e8 Section 480 mf5803.o(.bss) - .bss 0x200009c8 Section 196 modbus.o(.bss) - .bss 0x20000a8c Section 2048 modbus_rtu.o(.bss) - .bss 0x2000128c Section 276 uarts.o(.bss) - .bss 0x200013a0 Section 456 provalctrl.o(.bss) - .bss 0x20001568 Section 96 libspace.o(.bss) - HEAP 0x200015c8 Section 512 startup_stm32f407xx.o(HEAP) - Heap_Mem 0x200015c8 Data 512 startup_stm32f407xx.o(HEAP) - STACK 0x200017c8 Section 1024 startup_stm32f407xx.o(STACK) - Stack_Mem 0x200017c8 Data 1024 startup_stm32f407xx.o(STACK) - __initial_sp 0x20001bc8 Data 0 startup_stm32f407xx.o(STACK) + .data 0x20000164 Section 41 provalctrl.o(.data) + .data 0x20000190 Section 16 encoder.o(.data) + .bss 0x200001a0 Section 168 adc.o(.bss) + .bss 0x20000248 Section 84 i2c.o(.bss) + .bss 0x2000029c Section 88 spi.o(.bss) + .bss 0x200002f4 Section 216 tim.o(.bss) + .bss 0x200003cc Section 840 usart.o(.bss) + .bss 0x20000714 Section 176 ads1220.o(.bss) + .bss 0x200007c4 Section 41 eeprom.o(.bss) + .bss 0x200007f0 Section 480 mf5803.o(.bss) + .bss 0x200009d0 Section 196 modbus.o(.bss) + .bss 0x20000a94 Section 2048 modbus_rtu.o(.bss) + .bss 0x20001294 Section 276 uarts.o(.bss) + .bss 0x200013a8 Section 456 provalctrl.o(.bss) + .bss 0x20001570 Section 96 libspace.o(.bss) + HEAP 0x200015d0 Section 512 startup_stm32f407xx.o(HEAP) + Heap_Mem 0x200015d0 Data 512 startup_stm32f407xx.o(HEAP) + STACK 0x200017d0 Section 1024 startup_stm32f407xx.o(STACK) + Stack_Mem 0x200017d0 Data 1024 startup_stm32f407xx.o(STACK) + __initial_sp 0x20001bd0 Data 0 startup_stm32f407xx.o(STACK) Global Symbols @@ -3632,51 +3633,51 @@ Image Symbol Table modbus_process_rtu 0x08006285 Thumb Code 64 modbus_rtu.o(i.modbus_process_rtu) modbus_rtu_init 0x080062c9 Thumb Code 58 modbus_rtu.o(i.modbus_rtu_init) modbus_rx_cb 0x0800631d Thumb Code 98 modbus_rtu.o(i.modbus_rx_cb) - prov_adj 0x080063a1 Thumb Code 1488 provalctrl.o(i.prov_adj) - prov_adj_init 0x080069a5 Thumb Code 168 provalctrl.o(i.prov_adj_init) - prov_calibrate_pid 0x08006a5d Thumb Code 454 provalctrl.o(i.prov_calibrate_pid) - prov_ctrl 0x08006c29 Thumb Code 102 provalctrl.o(i.prov_ctrl) - prov_init 0x08006c95 Thumb Code 588 provalctrl.o(i.prov_init) - prov_set 0x08006f0d Thumb Code 244 provalctrl.o(i.prov_set) - readcoilstate_rtu 0x0800700d Thumb Code 326 modbus_rtu.o(i.readcoilstate_rtu) - readdisinputstate_rtu 0x0800715d Thumb Code 322 modbus_rtu.o(i.readdisinputstate_rtu) - readholdreg_rtu 0x080072a9 Thumb Code 258 modbus_rtu.o(i.readholdreg_rtu) - readinputreg_rtu 0x080073b5 Thumb Code 252 modbus_rtu.o(i.readinputreg_rtu) - setcs 0x080074b9 Thumb Code 86 ms5803.o(i.setcs) - tim6_cnt 0x08007521 Thumb Code 420 timer.o(i.tim6_cnt) - uart_send 0x0800772d Thumb Code 20 uarts.o(i.uart_send) - wf5803_ReadReg 0x08007741 Thumb Code 34 mf5803.o(i.wf5803_ReadReg) - wf5803_WriteReg 0x08007763 Thumb Code 34 mf5803.o(i.wf5803_WriteReg) - writemulticoil_rtu 0x08007785 Thumb Code 322 modbus_rtu.o(i.writemulticoil_rtu) - writemultireg_rtu 0x080078d1 Thumb Code 252 modbus_rtu.o(i.writemultireg_rtu) - writesinglecoil_rtu 0x080079d5 Thumb Code 188 modbus_rtu.o(i.writesinglecoil_rtu) - writesinglereg_rtu 0x08007a99 Thumb Code 176 modbus_rtu.o(i.writesinglereg_rtu) - __aeabi_dadd 0x08007b51 Thumb Code 0 daddsub_clz.o(x$fpl$dadd) - _dadd 0x08007b51 Thumb Code 332 daddsub_clz.o(x$fpl$dadd) - __aeabi_ddiv 0x08007ca1 Thumb Code 0 ddiv.o(x$fpl$ddiv) - _ddiv 0x08007ca1 Thumb Code 552 ddiv.o(x$fpl$ddiv) - __aeabi_d2iz 0x08007f51 Thumb Code 0 dfix.o(x$fpl$dfix) - _dfix 0x08007f51 Thumb Code 94 dfix.o(x$fpl$dfix) - __aeabi_d2uiz 0x08007fb1 Thumb Code 0 dfixu.o(x$fpl$dfixu) - _dfixu 0x08007fb1 Thumb Code 90 dfixu.o(x$fpl$dfixu) - __aeabi_i2d 0x0800800b Thumb Code 0 dflt_clz.o(x$fpl$dflt) - _dflt 0x0800800b Thumb Code 46 dflt_clz.o(x$fpl$dflt) - __aeabi_l2d 0x08008039 Thumb Code 0 dfltll_clz.o(x$fpl$dfltll) - _ll_sto_d 0x08008039 Thumb Code 162 dfltll_clz.o(x$fpl$dfltll) - __aeabi_dmul 0x080080dd Thumb Code 0 dmul.o(x$fpl$dmul) - _dmul 0x080080dd Thumb Code 332 dmul.o(x$fpl$dmul) - __fpl_dnaninf 0x08008231 Thumb Code 156 dnaninf.o(x$fpl$dnaninf) - __fpl_dretinf 0x080082cd Thumb Code 12 dretinf.o(x$fpl$dretinf) - __aeabi_dsub 0x080082d9 Thumb Code 0 daddsub_clz.o(x$fpl$dsub) - _dsub 0x080082d9 Thumb Code 464 daddsub_clz.o(x$fpl$dsub) - _fp_init 0x080084ad Thumb Code 10 fpinit.o(x$fpl$fpinit) - __fplib_config_fpu_vfp 0x080084b5 Thumb Code 0 fpinit.o(x$fpl$fpinit) - __fplib_config_pureend_doubles 0x080084b5 Thumb Code 0 fpinit.o(x$fpl$fpinit) - __I$use$fp 0x080084b6 Number 0 usenofp.o(x$fpl$usenofp) - AHBPrescTable 0x080084be Data 16 system_stm32f4xx.o(.constdata) - APBPrescTable 0x080084ce Data 8 system_stm32f4xx.o(.constdata) - Region$$Table$$Base 0x080084d8 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x080084f8 Number 0 anon$$obj.o(Region$$Table) + prov_adj 0x080063a1 Thumb Code 1496 provalctrl.o(i.prov_adj) + prov_adj_init 0x080069ad Thumb Code 168 provalctrl.o(i.prov_adj_init) + prov_calibrate_pid 0x08006a65 Thumb Code 926 provalctrl.o(i.prov_calibrate_pid) + prov_ctrl 0x08006e19 Thumb Code 102 provalctrl.o(i.prov_ctrl) + prov_init 0x08006e85 Thumb Code 588 provalctrl.o(i.prov_init) + prov_set 0x080070fd Thumb Code 244 provalctrl.o(i.prov_set) + readcoilstate_rtu 0x080071fd Thumb Code 326 modbus_rtu.o(i.readcoilstate_rtu) + readdisinputstate_rtu 0x0800734d Thumb Code 322 modbus_rtu.o(i.readdisinputstate_rtu) + readholdreg_rtu 0x08007499 Thumb Code 258 modbus_rtu.o(i.readholdreg_rtu) + readinputreg_rtu 0x080075a5 Thumb Code 252 modbus_rtu.o(i.readinputreg_rtu) + setcs 0x080076a9 Thumb Code 86 ms5803.o(i.setcs) + tim6_cnt 0x08007711 Thumb Code 420 timer.o(i.tim6_cnt) + uart_send 0x0800791d Thumb Code 20 uarts.o(i.uart_send) + wf5803_ReadReg 0x08007931 Thumb Code 34 mf5803.o(i.wf5803_ReadReg) + wf5803_WriteReg 0x08007953 Thumb Code 34 mf5803.o(i.wf5803_WriteReg) + writemulticoil_rtu 0x08007975 Thumb Code 322 modbus_rtu.o(i.writemulticoil_rtu) + writemultireg_rtu 0x08007ac1 Thumb Code 252 modbus_rtu.o(i.writemultireg_rtu) + writesinglecoil_rtu 0x08007bc5 Thumb Code 188 modbus_rtu.o(i.writesinglecoil_rtu) + writesinglereg_rtu 0x08007c89 Thumb Code 176 modbus_rtu.o(i.writesinglereg_rtu) + __aeabi_dadd 0x08007d41 Thumb Code 0 daddsub_clz.o(x$fpl$dadd) + _dadd 0x08007d41 Thumb Code 332 daddsub_clz.o(x$fpl$dadd) + __aeabi_ddiv 0x08007e91 Thumb Code 0 ddiv.o(x$fpl$ddiv) + _ddiv 0x08007e91 Thumb Code 552 ddiv.o(x$fpl$ddiv) + __aeabi_d2iz 0x08008141 Thumb Code 0 dfix.o(x$fpl$dfix) + _dfix 0x08008141 Thumb Code 94 dfix.o(x$fpl$dfix) + __aeabi_d2uiz 0x080081a1 Thumb Code 0 dfixu.o(x$fpl$dfixu) + _dfixu 0x080081a1 Thumb Code 90 dfixu.o(x$fpl$dfixu) + __aeabi_i2d 0x080081fb Thumb Code 0 dflt_clz.o(x$fpl$dflt) + _dflt 0x080081fb Thumb Code 46 dflt_clz.o(x$fpl$dflt) + __aeabi_l2d 0x08008229 Thumb Code 0 dfltll_clz.o(x$fpl$dfltll) + _ll_sto_d 0x08008229 Thumb Code 162 dfltll_clz.o(x$fpl$dfltll) + __aeabi_dmul 0x080082cd Thumb Code 0 dmul.o(x$fpl$dmul) + _dmul 0x080082cd Thumb Code 332 dmul.o(x$fpl$dmul) + __fpl_dnaninf 0x08008421 Thumb Code 156 dnaninf.o(x$fpl$dnaninf) + __fpl_dretinf 0x080084bd Thumb Code 12 dretinf.o(x$fpl$dretinf) + __aeabi_dsub 0x080084c9 Thumb Code 0 daddsub_clz.o(x$fpl$dsub) + _dsub 0x080084c9 Thumb Code 464 daddsub_clz.o(x$fpl$dsub) + _fp_init 0x0800869d Thumb Code 10 fpinit.o(x$fpl$fpinit) + __fplib_config_fpu_vfp 0x080086a5 Thumb Code 0 fpinit.o(x$fpl$fpinit) + __fplib_config_pureend_doubles 0x080086a5 Thumb Code 0 fpinit.o(x$fpl$fpinit) + __I$use$fp 0x080086a6 Number 0 usenofp.o(x$fpl$usenofp) + AHBPrescTable 0x080086ae Data 16 system_stm32f4xx.o(.constdata) + APBPrescTable 0x080086be Data 8 system_stm32f4xx.o(.constdata) + Region$$Table$$Base 0x080086c8 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x080086e8 Number 0 anon$$obj.o(Region$$Table) uwTick 0x20000000 Data 4 stm32f4xx_hal.o(.data) uwTickPrio 0x20000004 Data 4 stm32f4xx_hal.o(.data) uwTickFreq 0x20000008 Data 1 stm32f4xx_hal.o(.data) @@ -3741,55 +3742,57 @@ Image Symbol Table RxBuffer 0x2000015c Data 1 uarts.o(.data) __stdout 0x20000160 Data 4 uarts.o(.data) out_makeup 0x20000164 Data 4 provalctrl.o(.data) - ao_dwq 0x20000168 Data 4 provalctrl.o(.data) - ao_blf1 0x2000016c Data 4 provalctrl.o(.data) - ao_blf2 0x20000170 Data 4 provalctrl.o(.data) - atm_pressure 0x20000174 Data 4 provalctrl.o(.data) - astep 0x20000178 Data 1 provalctrl.o(.data) - tick_previous 0x2000017c Data 4 provalctrl.o(.data) - tick_current 0x20000180 Data 4 provalctrl.o(.data) - hys_flag 0x20000184 Data 1 provalctrl.o(.data) - last_encode_num 0x20000188 Data 4 encoder.o(.data) - curr_encode_num 0x2000018c Data 4 encoder.o(.data) - encode_num 0x20000190 Data 4 encoder.o(.data) - cnt_update 0x20000194 Data 4 encoder.o(.data) - hadc1 0x20000198 Data 72 adc.o(.bss) - hdma_adc1 0x200001e0 Data 96 adc.o(.bss) - hi2c1 0x20000240 Data 84 i2c.o(.bss) - hspi2 0x20000294 Data 88 spi.o(.bss) - htim1 0x200002ec Data 72 tim.o(.bss) - htim6 0x20000334 Data 72 tim.o(.bss) - htim7 0x2000037c Data 72 tim.o(.bss) - huart4 0x200003c4 Data 72 usart.o(.bss) - huart1 0x2000040c Data 72 usart.o(.bss) - huart2 0x20000454 Data 72 usart.o(.bss) - huart3 0x2000049c Data 72 usart.o(.bss) - huart6 0x200004e4 Data 72 usart.o(.bss) - hdma_uart4_tx 0x2000052c Data 96 usart.o(.bss) - hdma_usart1_tx 0x2000058c Data 96 usart.o(.bss) - hdma_usart2_tx 0x200005ec Data 96 usart.o(.bss) - hdma_usart3_tx 0x2000064c Data 96 usart.o(.bss) - hdma_usart6_tx 0x200006ac Data 96 usart.o(.bss) - ads1220_data 0x2000070c Data 16 ads1220.o(.bss) - ads_v 0x2000071c Data 160 ads1220.o(.bss) - Rx1_Buffer 0x200007bc Data 17 eeprom.o(.bss) - trans1 0x200007cd Data 12 eeprom.o(.bss) - trans2 0x200007d9 Data 12 eeprom.o(.bss) - p_flt_window 0x200007e8 Data 480 mf5803.o(.bss) - InputReg 0x200009c8 Data 98 modbus.o(.bss) - SamVarReg 0x20000a2a Data 98 modbus.o(.bss) - uart1_rx_buf 0x20000a8c Data 1024 modbus_rtu.o(.bss) - uart1_tx_buf 0x20000e8c Data 1024 modbus_rtu.o(.bss) - UART6_RxBuffer 0x2000128c Data 256 uarts.o(.bss) - uart1 0x2000138c Data 20 uarts.o(.bss) - pv_one 0x200013a0 Data 148 provalctrl.o(.bss) - pv_two 0x20001434 Data 148 provalctrl.o(.bss) - data_wr 0x200014c8 Data 12 provalctrl.o(.bss) - data_rd 0x200014d4 Data 12 provalctrl.o(.bss) - adj_pv1 0x200014e0 Data 68 provalctrl.o(.bss) - adj_pv2 0x20001524 Data 68 provalctrl.o(.bss) - __libspace_start 0x20001568 Data 96 libspace.o(.bss) - __temporary_stack_top$libspace 0x200015c8 Data 0 libspace.o(.bss) + beta_in 0x20000168 Data 4 provalctrl.o(.data) + beta_out 0x2000016c Data 4 provalctrl.o(.data) + ao_dwq 0x20000170 Data 4 provalctrl.o(.data) + ao_blf1 0x20000174 Data 4 provalctrl.o(.data) + ao_blf2 0x20000178 Data 4 provalctrl.o(.data) + atm_pressure 0x2000017c Data 4 provalctrl.o(.data) + astep 0x20000180 Data 1 provalctrl.o(.data) + tick_previous 0x20000184 Data 4 provalctrl.o(.data) + tick_current 0x20000188 Data 4 provalctrl.o(.data) + hys_flag 0x2000018c Data 1 provalctrl.o(.data) + last_encode_num 0x20000190 Data 4 encoder.o(.data) + curr_encode_num 0x20000194 Data 4 encoder.o(.data) + encode_num 0x20000198 Data 4 encoder.o(.data) + cnt_update 0x2000019c Data 4 encoder.o(.data) + hadc1 0x200001a0 Data 72 adc.o(.bss) + hdma_adc1 0x200001e8 Data 96 adc.o(.bss) + hi2c1 0x20000248 Data 84 i2c.o(.bss) + hspi2 0x2000029c Data 88 spi.o(.bss) + htim1 0x200002f4 Data 72 tim.o(.bss) + htim6 0x2000033c Data 72 tim.o(.bss) + htim7 0x20000384 Data 72 tim.o(.bss) + huart4 0x200003cc Data 72 usart.o(.bss) + huart1 0x20000414 Data 72 usart.o(.bss) + huart2 0x2000045c Data 72 usart.o(.bss) + huart3 0x200004a4 Data 72 usart.o(.bss) + huart6 0x200004ec Data 72 usart.o(.bss) + hdma_uart4_tx 0x20000534 Data 96 usart.o(.bss) + hdma_usart1_tx 0x20000594 Data 96 usart.o(.bss) + hdma_usart2_tx 0x200005f4 Data 96 usart.o(.bss) + hdma_usart3_tx 0x20000654 Data 96 usart.o(.bss) + hdma_usart6_tx 0x200006b4 Data 96 usart.o(.bss) + ads1220_data 0x20000714 Data 16 ads1220.o(.bss) + ads_v 0x20000724 Data 160 ads1220.o(.bss) + Rx1_Buffer 0x200007c4 Data 17 eeprom.o(.bss) + trans1 0x200007d5 Data 12 eeprom.o(.bss) + trans2 0x200007e1 Data 12 eeprom.o(.bss) + p_flt_window 0x200007f0 Data 480 mf5803.o(.bss) + InputReg 0x200009d0 Data 98 modbus.o(.bss) + SamVarReg 0x20000a32 Data 98 modbus.o(.bss) + uart1_rx_buf 0x20000a94 Data 1024 modbus_rtu.o(.bss) + uart1_tx_buf 0x20000e94 Data 1024 modbus_rtu.o(.bss) + UART6_RxBuffer 0x20001294 Data 256 uarts.o(.bss) + uart1 0x20001394 Data 20 uarts.o(.bss) + pv_one 0x200013a8 Data 148 provalctrl.o(.bss) + pv_two 0x2000143c Data 148 provalctrl.o(.bss) + data_wr 0x200014d0 Data 12 provalctrl.o(.bss) + data_rd 0x200014dc Data 12 provalctrl.o(.bss) + adj_pv1 0x200014e8 Data 68 provalctrl.o(.bss) + adj_pv2 0x2000152c Data 68 provalctrl.o(.bss) + __libspace_start 0x20001570 Data 96 libspace.o(.bss) + __temporary_stack_top$libspace 0x200015d0 Data 0 libspace.o(.bss) @@ -3799,9 +3802,9 @@ Memory Map of the image Image Entry point : 0x08000189 - Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00008690, Max: 0x00100000, ABSOLUTE, COMPRESSED[0x00008518]) + Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00008888, Max: 0x00100000, ABSOLUTE, COMPRESSED[0x00008708]) - Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000084f8, Max: 0x00100000, ABSOLUTE) + Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000086e8, Max: 0x00100000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -4084,46 +4087,46 @@ Memory Map of the image 0x08006284 0x08006284 0x00000044 Code RO 5110 i.modbus_process_rtu modbus_rtu.o 0x080062c8 0x080062c8 0x00000054 Code RO 5111 i.modbus_rtu_init modbus_rtu.o 0x0800631c 0x0800631c 0x00000084 Code RO 5112 i.modbus_rx_cb modbus_rtu.o - 0x080063a0 0x080063a0 0x00000604 Code RO 5963 i.prov_adj provalctrl.o - 0x080069a4 0x080069a4 0x000000b8 Code RO 5964 i.prov_adj_init provalctrl.o - 0x08006a5c 0x08006a5c 0x000001cc Code RO 5965 i.prov_calibrate_pid provalctrl.o - 0x08006c28 0x08006c28 0x0000006c Code RO 5966 i.prov_ctrl provalctrl.o - 0x08006c94 0x08006c94 0x00000278 Code RO 5967 i.prov_init provalctrl.o - 0x08006f0c 0x08006f0c 0x00000100 Code RO 5968 i.prov_set provalctrl.o - 0x0800700c 0x0800700c 0x00000150 Code RO 5113 i.readcoilstate_rtu modbus_rtu.o - 0x0800715c 0x0800715c 0x0000014c Code RO 5114 i.readdisinputstate_rtu modbus_rtu.o - 0x080072a8 0x080072a8 0x0000010c Code RO 5115 i.readholdreg_rtu modbus_rtu.o - 0x080073b4 0x080073b4 0x00000104 Code RO 5116 i.readinputreg_rtu modbus_rtu.o - 0x080074b8 0x080074b8 0x00000068 Code RO 4749 i.setcs ms5803.o - 0x08007520 0x08007520 0x0000020c Code RO 5867 i.tim6_cnt timer.o - 0x0800772c 0x0800772c 0x00000014 Code RO 5910 i.uart_send uarts.o - 0x08007740 0x08007740 0x00000022 Code RO 4970 i.wf5803_ReadReg mf5803.o - 0x08007762 0x08007762 0x00000022 Code RO 4972 i.wf5803_WriteReg mf5803.o - 0x08007784 0x08007784 0x0000014c Code RO 5117 i.writemulticoil_rtu modbus_rtu.o - 0x080078d0 0x080078d0 0x00000104 Code RO 5118 i.writemultireg_rtu modbus_rtu.o - 0x080079d4 0x080079d4 0x000000c4 Code RO 5119 i.writesinglecoil_rtu modbus_rtu.o - 0x08007a98 0x08007a98 0x000000b8 Code RO 5120 i.writesinglereg_rtu modbus_rtu.o - 0x08007b50 0x08007b50 0x00000150 Code RO 6188 x$fpl$dadd fz_wm.l(daddsub_clz.o) - 0x08007ca0 0x08007ca0 0x000002b0 Code RO 6195 x$fpl$ddiv fz_wm.l(ddiv.o) - 0x08007f50 0x08007f50 0x0000005e Code RO 6198 x$fpl$dfix fz_wm.l(dfix.o) - 0x08007fae 0x08007fae 0x00000002 PAD - 0x08007fb0 0x08007fb0 0x0000005a Code RO 6206 x$fpl$dfixu fz_wm.l(dfixu.o) - 0x0800800a 0x0800800a 0x0000002e Code RO 6211 x$fpl$dflt fz_wm.l(dflt_clz.o) - 0x08008038 0x08008038 0x000000a2 Code RO 6216 x$fpl$dfltll fz_wm.l(dfltll_clz.o) - 0x080080da 0x080080da 0x00000002 PAD - 0x080080dc 0x080080dc 0x00000154 Code RO 6220 x$fpl$dmul fz_wm.l(dmul.o) - 0x08008230 0x08008230 0x0000009c Code RO 6252 x$fpl$dnaninf fz_wm.l(dnaninf.o) - 0x080082cc 0x080082cc 0x0000000c Code RO 6254 x$fpl$dretinf fz_wm.l(dretinf.o) - 0x080082d8 0x080082d8 0x000001d4 Code RO 6190 x$fpl$dsub fz_wm.l(daddsub_clz.o) - 0x080084ac 0x080084ac 0x0000000a Code RO 6423 x$fpl$fpinit fz_wm.l(fpinit.o) - 0x080084b6 0x080084b6 0x00000000 Code RO 6260 x$fpl$usenofp fz_wm.l(usenofp.o) - 0x080084b6 0x080084b6 0x00000008 Data RO 1572 .constdata stm32f4xx_hal_dma.o - 0x080084be 0x080084be 0x00000018 Data RO 4417 .constdata system_stm32f4xx.o - 0x080084d6 0x080084d6 0x00000002 PAD - 0x080084d8 0x080084d8 0x00000020 Data RO 6479 Region$$Table anon$$obj.o + 0x080063a0 0x080063a0 0x0000060c Code RO 5963 i.prov_adj provalctrl.o + 0x080069ac 0x080069ac 0x000000b8 Code RO 5964 i.prov_adj_init provalctrl.o + 0x08006a64 0x08006a64 0x000003b4 Code RO 5965 i.prov_calibrate_pid provalctrl.o + 0x08006e18 0x08006e18 0x0000006c Code RO 5966 i.prov_ctrl provalctrl.o + 0x08006e84 0x08006e84 0x00000278 Code RO 5967 i.prov_init provalctrl.o + 0x080070fc 0x080070fc 0x00000100 Code RO 5968 i.prov_set provalctrl.o + 0x080071fc 0x080071fc 0x00000150 Code RO 5113 i.readcoilstate_rtu modbus_rtu.o + 0x0800734c 0x0800734c 0x0000014c Code RO 5114 i.readdisinputstate_rtu modbus_rtu.o + 0x08007498 0x08007498 0x0000010c Code RO 5115 i.readholdreg_rtu modbus_rtu.o + 0x080075a4 0x080075a4 0x00000104 Code RO 5116 i.readinputreg_rtu modbus_rtu.o + 0x080076a8 0x080076a8 0x00000068 Code RO 4749 i.setcs ms5803.o + 0x08007710 0x08007710 0x0000020c Code RO 5867 i.tim6_cnt timer.o + 0x0800791c 0x0800791c 0x00000014 Code RO 5910 i.uart_send uarts.o + 0x08007930 0x08007930 0x00000022 Code RO 4970 i.wf5803_ReadReg mf5803.o + 0x08007952 0x08007952 0x00000022 Code RO 4972 i.wf5803_WriteReg mf5803.o + 0x08007974 0x08007974 0x0000014c Code RO 5117 i.writemulticoil_rtu modbus_rtu.o + 0x08007ac0 0x08007ac0 0x00000104 Code RO 5118 i.writemultireg_rtu modbus_rtu.o + 0x08007bc4 0x08007bc4 0x000000c4 Code RO 5119 i.writesinglecoil_rtu modbus_rtu.o + 0x08007c88 0x08007c88 0x000000b8 Code RO 5120 i.writesinglereg_rtu modbus_rtu.o + 0x08007d40 0x08007d40 0x00000150 Code RO 6188 x$fpl$dadd fz_wm.l(daddsub_clz.o) + 0x08007e90 0x08007e90 0x000002b0 Code RO 6195 x$fpl$ddiv fz_wm.l(ddiv.o) + 0x08008140 0x08008140 0x0000005e Code RO 6198 x$fpl$dfix fz_wm.l(dfix.o) + 0x0800819e 0x0800819e 0x00000002 PAD + 0x080081a0 0x080081a0 0x0000005a Code RO 6206 x$fpl$dfixu fz_wm.l(dfixu.o) + 0x080081fa 0x080081fa 0x0000002e Code RO 6211 x$fpl$dflt fz_wm.l(dflt_clz.o) + 0x08008228 0x08008228 0x000000a2 Code RO 6216 x$fpl$dfltll fz_wm.l(dfltll_clz.o) + 0x080082ca 0x080082ca 0x00000002 PAD + 0x080082cc 0x080082cc 0x00000154 Code RO 6220 x$fpl$dmul fz_wm.l(dmul.o) + 0x08008420 0x08008420 0x0000009c Code RO 6252 x$fpl$dnaninf fz_wm.l(dnaninf.o) + 0x080084bc 0x080084bc 0x0000000c Code RO 6254 x$fpl$dretinf fz_wm.l(dretinf.o) + 0x080084c8 0x080084c8 0x000001d4 Code RO 6190 x$fpl$dsub fz_wm.l(daddsub_clz.o) + 0x0800869c 0x0800869c 0x0000000a Code RO 6423 x$fpl$fpinit fz_wm.l(fpinit.o) + 0x080086a6 0x080086a6 0x00000000 Code RO 6260 x$fpl$usenofp fz_wm.l(usenofp.o) + 0x080086a6 0x080086a6 0x00000008 Data RO 1572 .constdata stm32f4xx_hal_dma.o + 0x080086ae 0x080086ae 0x00000018 Data RO 4417 .constdata system_stm32f4xx.o + 0x080086c6 0x080086c6 0x00000002 PAD + 0x080086c8 0x080086c8 0x00000020 Data RO 6479 Region$$Table anon$$obj.o - Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x080084f8, Size: 0x00001bc8, Max: 0x0001c000, ABSOLUTE, COMPRESSED[0x00000020]) + Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x080086e8, Size: 0x00001bd0, Max: 0x0001c000, ABSOLUTE, COMPRESSED[0x00000020]) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -4143,28 +4146,28 @@ Memory Map of the image 0x200000f0 COMPRESSED 0x00000069 Data RW 5868 .data timer.o 0x20000159 COMPRESSED 0x00000003 PAD 0x2000015c COMPRESSED 0x00000008 Data RW 5912 .data uarts.o - 0x20000164 COMPRESSED 0x00000021 Data RW 5970 .data provalctrl.o - 0x20000185 COMPRESSED 0x00000003 PAD - 0x20000188 COMPRESSED 0x00000010 Data RW 6036 .data encoder.o - 0x20000198 - 0x000000a8 Zero RW 312 .bss adc.o - 0x20000240 - 0x00000054 Zero RW 378 .bss i2c.o - 0x20000294 - 0x00000058 Zero RW 420 .bss spi.o - 0x200002ec - 0x000000d8 Zero RW 466 .bss tim.o - 0x200003c4 - 0x00000348 Zero RW 532 .bss usart.o - 0x2000070c - 0x000000b0 Zero RW 4516 .bss ads1220.o - 0x200007bc - 0x00000029 Zero RW 4642 .bss eeprom.o - 0x200007e5 COMPRESSED 0x00000003 PAD - 0x200007e8 - 0x000001e0 Zero RW 4973 .bss mf5803.o - 0x200009c8 - 0x000000c4 Zero RW 5047 .bss modbus.o - 0x20000a8c - 0x00000800 Zero RW 5121 .bss modbus_rtu.o - 0x2000128c - 0x00000114 Zero RW 5911 .bss uarts.o - 0x200013a0 - 0x000001c8 Zero RW 5969 .bss provalctrl.o - 0x20001568 - 0x00000060 Zero RW 6333 .bss c_w.l(libspace.o) - 0x200015c8 - 0x00000200 Zero RW 2 HEAP startup_stm32f407xx.o - 0x200017c8 - 0x00000400 Zero RW 1 STACK startup_stm32f407xx.o + 0x20000164 COMPRESSED 0x00000029 Data RW 5970 .data provalctrl.o + 0x2000018d COMPRESSED 0x00000003 PAD + 0x20000190 COMPRESSED 0x00000010 Data RW 6036 .data encoder.o + 0x200001a0 - 0x000000a8 Zero RW 312 .bss adc.o + 0x20000248 - 0x00000054 Zero RW 378 .bss i2c.o + 0x2000029c - 0x00000058 Zero RW 420 .bss spi.o + 0x200002f4 - 0x000000d8 Zero RW 466 .bss tim.o + 0x200003cc - 0x00000348 Zero RW 532 .bss usart.o + 0x20000714 - 0x000000b0 Zero RW 4516 .bss ads1220.o + 0x200007c4 - 0x00000029 Zero RW 4642 .bss eeprom.o + 0x200007ed COMPRESSED 0x00000003 PAD + 0x200007f0 - 0x000001e0 Zero RW 4973 .bss mf5803.o + 0x200009d0 - 0x000000c4 Zero RW 5047 .bss modbus.o + 0x20000a94 - 0x00000800 Zero RW 5121 .bss modbus_rtu.o + 0x20001294 - 0x00000114 Zero RW 5911 .bss uarts.o + 0x200013a8 - 0x000001c8 Zero RW 5969 .bss provalctrl.o + 0x20001570 - 0x00000060 Zero RW 6333 .bss c_w.l(libspace.o) + 0x200015d0 - 0x00000200 Zero RW 2 HEAP startup_stm32f407xx.o + 0x200017d0 - 0x00000400 Zero RW 1 STACK startup_stm32f407xx.o - Execution Region RW_IRAM2 (Exec base: 0x2001c000, Load base: 0x08008518, Size: 0x00000000, Max: 0x00004000, ABSOLUTE) + Execution Region RW_IRAM2 (Exec base: 0x2001c000, Load base: 0x08008708, Size: 0x00000000, Max: 0x00004000, ABSOLUTE) **** No section assigned to this execution region **** @@ -4195,7 +4198,7 @@ Image component sizes 358 32 0 110 196 7180 modbus.o 2760 146 0 0 2048 13994 modbus_rtu.o 256 50 0 17 0 3199 ms5803.o - 3946 250 0 33 456 9081 provalctrl.o + 4442 266 0 41 456 9270 provalctrl.o 204 22 0 0 88 1861 spi.o 64 26 392 0 1536 892 startup_stm32f407xx.o 212 36 0 9 0 9777 stm32f4xx_hal.o @@ -4218,7 +4221,7 @@ Image component sizes 1288 114 0 0 840 5222 usart.o ---------------------------------------------------------------------- - 30216 2042 458 408 6608 946561 Object Totals + 30712 2058 458 416 6608 946750 Object Totals 0 0 32 0 0 0 (incl. Generated) 30 0 2 13 3 0 (incl. Padding) @@ -4283,15 +4286,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 33582 2234 458 408 6704 926409 Grand Totals - 33582 2234 458 32 6704 926409 ELF Image Totals (compressed) - 33582 2234 458 32 0 0 ROM Totals + 34078 2250 458 416 6704 926598 Grand Totals + 34078 2250 458 32 6704 926598 ELF Image Totals (compressed) + 34078 2250 458 32 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 34040 ( 33.24kB) - Total RW Size (RW Data + ZI Data) 7112 ( 6.95kB) - Total ROM Size (Code + RO Data + RW Data) 34072 ( 33.27kB) + Total RO Size (Code + RO Data) 34536 ( 33.73kB) + Total RW Size (RW Data + ZI Data) 7120 ( 6.95kB) + Total ROM Size (Code + RO Data + RW Data) 34568 ( 33.76kB) ============================================================================== diff --git a/MDK-ARM/VOQC/VOQC_VOQC.dep b/MDK-ARM/VOQC/VOQC_VOQC.dep index 606a4f5..ad28f5e 100644 --- a/MDK-ARM/VOQC/VOQC_VOQC.dep +++ b/MDK-ARM/VOQC/VOQC_VOQC.dep @@ -66,7 +66,7 @@ I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compile I (../board/Inc/ms5803.h)(0x669760FF) I (../board/Inc/ds18b20.h)(0x6694D35E) I (../board/Inc/dac7311.h)(0x66949B65) -I (../users/Inc/provalctrl.h)(0x66CFD26E) +I (../users/Inc/provalctrl.h)(0x66DAB0EF) I (../board/Inc/eeprom.h)(0x66CE9587) F (../Core/Src/gpio.c)(0x66C2E5A9)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc -I.\RTE\_VOQC -IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include -IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include -D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx -o voqc\gpio.o --omf_browse voqc\gpio.crf --depend voqc\gpio.d) I (../Core/Inc/gpio.h)(0x668F85FA) @@ -1429,7 +1429,7 @@ I (../CH395Q/ch395inc.h)(0x66C443B0) I (../Core/Inc/spi.h)(0x668F85FC) I (../CH395Q/ch395cmd.h)(0x664FF969) I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2) -I (../users/Inc/provalctrl.h)(0x66CFD26E) +I (../users/Inc/provalctrl.h)(0x66DAB0EF) I (../board/Inc/dac7311.h)(0x66949B65) I (../board/Inc/eeprom.h)(0x66CE9587) F (..\board\Src\dac7311.c)(0x66AB21F7)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc -I.\RTE\_VOQC -IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include -IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include -D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx -o voqc\dac7311.o --omf_browse voqc\dac7311.crf --depend voqc\dac7311.d) @@ -2242,8 +2242,8 @@ I (../Core/Inc/spi.h)(0x668F85FC) I (../CH395Q/ch395cmd.h)(0x664FF969) I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2) I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2) -F (..\users\Src\provalctrl.c)(0x66D517CB)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc -I.\RTE\_VOQC -IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include -IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include -D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx -o voqc\provalctrl.o --omf_browse voqc\provalctrl.crf --depend voqc\provalctrl.d) -I (../users/Inc/provalctrl.h)(0x66CFD26E) +F (..\users\Src\provalctrl.c)(0x66DAB147)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc -I.\RTE\_VOQC -IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include -IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include -D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx -o voqc\provalctrl.o --omf_browse voqc\provalctrl.crf --depend voqc\provalctrl.d) +I (../users/Inc/provalctrl.h)(0x66DAB0EF) I (../modbus/Inc/modbus.h)(0x66CEC5B0) I (../users/Inc/timer.h)(0x66CEDE30) I (../Core/Inc/tim.h)(0x6694D67D) diff --git a/MDK-ARM/VOQC/adc.o b/MDK-ARM/VOQC/adc.o index d5de150..2e47cf4 100644 Binary files a/MDK-ARM/VOQC/adc.o and b/MDK-ARM/VOQC/adc.o differ diff --git a/MDK-ARM/VOQC/adcs.o b/MDK-ARM/VOQC/adcs.o index e7436ce..64cf6df 100644 Binary files a/MDK-ARM/VOQC/adcs.o and b/MDK-ARM/VOQC/adcs.o differ diff --git a/MDK-ARM/VOQC/ads1220.crf b/MDK-ARM/VOQC/ads1220.crf index 371101b..01ac02f 100644 Binary files a/MDK-ARM/VOQC/ads1220.crf and b/MDK-ARM/VOQC/ads1220.crf differ diff --git a/MDK-ARM/VOQC/ads1220.o b/MDK-ARM/VOQC/ads1220.o index f57f1d3..d183d08 100644 Binary files a/MDK-ARM/VOQC/ads1220.o and b/MDK-ARM/VOQC/ads1220.o differ diff --git a/MDK-ARM/VOQC/ads1256.o b/MDK-ARM/VOQC/ads1256.o index 81e102e..fe28ae0 100644 Binary files a/MDK-ARM/VOQC/ads1256.o and b/MDK-ARM/VOQC/ads1256.o differ diff --git a/MDK-ARM/VOQC/ch395.o b/MDK-ARM/VOQC/ch395.o index e3a1e97..f799db5 100644 Binary files a/MDK-ARM/VOQC/ch395.o and b/MDK-ARM/VOQC/ch395.o differ diff --git a/MDK-ARM/VOQC/ch395cmd.o b/MDK-ARM/VOQC/ch395cmd.o index adde6b0..a1c4375 100644 Binary files a/MDK-ARM/VOQC/ch395cmd.o and b/MDK-ARM/VOQC/ch395cmd.o differ diff --git a/MDK-ARM/VOQC/dac7311.o b/MDK-ARM/VOQC/dac7311.o index cb58ca2..435531a 100644 Binary files a/MDK-ARM/VOQC/dac7311.o and b/MDK-ARM/VOQC/dac7311.o differ diff --git a/MDK-ARM/VOQC/dma.o b/MDK-ARM/VOQC/dma.o index 577b14d..19f60e5 100644 Binary files a/MDK-ARM/VOQC/dma.o and b/MDK-ARM/VOQC/dma.o differ diff --git a/MDK-ARM/VOQC/ds18b20.o b/MDK-ARM/VOQC/ds18b20.o index 32f5aea..3218f91 100644 Binary files a/MDK-ARM/VOQC/ds18b20.o and b/MDK-ARM/VOQC/ds18b20.o differ diff --git a/MDK-ARM/VOQC/eeprom.o b/MDK-ARM/VOQC/eeprom.o index c32eecd..fdc0573 100644 Binary files a/MDK-ARM/VOQC/eeprom.o and b/MDK-ARM/VOQC/eeprom.o differ diff --git a/MDK-ARM/VOQC/encoder.o b/MDK-ARM/VOQC/encoder.o index 74c8bdb..7319f8a 100644 Binary files a/MDK-ARM/VOQC/encoder.o and b/MDK-ARM/VOQC/encoder.o differ diff --git a/MDK-ARM/VOQC/flash.o b/MDK-ARM/VOQC/flash.o index 49d2ac1..fb8cc31 100644 Binary files a/MDK-ARM/VOQC/flash.o and b/MDK-ARM/VOQC/flash.o differ diff --git a/MDK-ARM/VOQC/gpio.o b/MDK-ARM/VOQC/gpio.o index f462bf2..40fb541 100644 Binary files a/MDK-ARM/VOQC/gpio.o and b/MDK-ARM/VOQC/gpio.o differ diff --git a/MDK-ARM/VOQC/gpios.o b/MDK-ARM/VOQC/gpios.o index e3ad5f7..f1e5e43 100644 Binary files a/MDK-ARM/VOQC/gpios.o and b/MDK-ARM/VOQC/gpios.o differ diff --git a/MDK-ARM/VOQC/hc165.o b/MDK-ARM/VOQC/hc165.o index f482e20..5b5a5fd 100644 Binary files a/MDK-ARM/VOQC/hc165.o and b/MDK-ARM/VOQC/hc165.o differ diff --git a/MDK-ARM/VOQC/hc595.o b/MDK-ARM/VOQC/hc595.o index 118fe32..df06217 100644 Binary files a/MDK-ARM/VOQC/hc595.o and b/MDK-ARM/VOQC/hc595.o differ diff --git a/MDK-ARM/VOQC/i2c.o b/MDK-ARM/VOQC/i2c.o index bbdd456..8437f52 100644 Binary files a/MDK-ARM/VOQC/i2c.o and b/MDK-ARM/VOQC/i2c.o differ diff --git a/MDK-ARM/VOQC/main.crf b/MDK-ARM/VOQC/main.crf index db6d35d..81c1954 100644 Binary files a/MDK-ARM/VOQC/main.crf and b/MDK-ARM/VOQC/main.crf differ diff --git a/MDK-ARM/VOQC/main.o b/MDK-ARM/VOQC/main.o index fd70ab4..c85baff 100644 Binary files a/MDK-ARM/VOQC/main.o and b/MDK-ARM/VOQC/main.o differ diff --git a/MDK-ARM/VOQC/mf5803.o b/MDK-ARM/VOQC/mf5803.o index cce990d..0755913 100644 Binary files a/MDK-ARM/VOQC/mf5803.o and b/MDK-ARM/VOQC/mf5803.o differ diff --git a/MDK-ARM/VOQC/modbus.o b/MDK-ARM/VOQC/modbus.o index 4b2d9cd..8a7aa8b 100644 Binary files a/MDK-ARM/VOQC/modbus.o and b/MDK-ARM/VOQC/modbus.o differ diff --git a/MDK-ARM/VOQC/modbus_rtu.o b/MDK-ARM/VOQC/modbus_rtu.o index 1ccf215..b17f368 100644 Binary files a/MDK-ARM/VOQC/modbus_rtu.o and b/MDK-ARM/VOQC/modbus_rtu.o differ diff --git a/MDK-ARM/VOQC/modbus_tcp.o b/MDK-ARM/VOQC/modbus_tcp.o index d20c0e0..163e016 100644 Binary files a/MDK-ARM/VOQC/modbus_tcp.o and b/MDK-ARM/VOQC/modbus_tcp.o differ diff --git a/MDK-ARM/VOQC/ms5803.o b/MDK-ARM/VOQC/ms5803.o index abd4f55..fea81f2 100644 Binary files a/MDK-ARM/VOQC/ms5803.o and b/MDK-ARM/VOQC/ms5803.o differ diff --git a/MDK-ARM/VOQC/provalctrl.crf b/MDK-ARM/VOQC/provalctrl.crf index 8b9caeb..12ff93f 100644 Binary files a/MDK-ARM/VOQC/provalctrl.crf and b/MDK-ARM/VOQC/provalctrl.crf differ diff --git a/MDK-ARM/VOQC/provalctrl.o b/MDK-ARM/VOQC/provalctrl.o index 11d5149..2c3456c 100644 Binary files a/MDK-ARM/VOQC/provalctrl.o and b/MDK-ARM/VOQC/provalctrl.o differ diff --git a/MDK-ARM/VOQC/spi.o b/MDK-ARM/VOQC/spi.o index a6791e8..8657dc8 100644 Binary files a/MDK-ARM/VOQC/spi.o and b/MDK-ARM/VOQC/spi.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal.o b/MDK-ARM/VOQC/stm32f4xx_hal.o index 62b72e0..9220556 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal.o and b/MDK-ARM/VOQC/stm32f4xx_hal.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_adc.o b/MDK-ARM/VOQC/stm32f4xx_hal_adc.o index 1e6530e..e1700db 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_adc.o and b/MDK-ARM/VOQC/stm32f4xx_hal_adc.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_adc_ex.o b/MDK-ARM/VOQC/stm32f4xx_hal_adc_ex.o index 17a5015..ed325f2 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_adc_ex.o and b/MDK-ARM/VOQC/stm32f4xx_hal_adc_ex.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_cortex.o b/MDK-ARM/VOQC/stm32f4xx_hal_cortex.o index 1a64125..fa18b6c 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_cortex.o and b/MDK-ARM/VOQC/stm32f4xx_hal_cortex.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_dma.o b/MDK-ARM/VOQC/stm32f4xx_hal_dma.o index 2a77ba6..da8479b 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_dma.o and b/MDK-ARM/VOQC/stm32f4xx_hal_dma.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_dma_ex.o b/MDK-ARM/VOQC/stm32f4xx_hal_dma_ex.o index 4114f02..9bea526 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_dma_ex.o and b/MDK-ARM/VOQC/stm32f4xx_hal_dma_ex.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_exti.o b/MDK-ARM/VOQC/stm32f4xx_hal_exti.o index b1cf6e5..a947e1b 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_exti.o and b/MDK-ARM/VOQC/stm32f4xx_hal_exti.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_flash.o b/MDK-ARM/VOQC/stm32f4xx_hal_flash.o index 25f77fd..4153148 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_flash.o and b/MDK-ARM/VOQC/stm32f4xx_hal_flash.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_flash_ex.o b/MDK-ARM/VOQC/stm32f4xx_hal_flash_ex.o index 1529f0d..3ad84b4 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_flash_ex.o and b/MDK-ARM/VOQC/stm32f4xx_hal_flash_ex.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_flash_ramfunc.o b/MDK-ARM/VOQC/stm32f4xx_hal_flash_ramfunc.o index 52ece24..0cd4a10 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_flash_ramfunc.o and b/MDK-ARM/VOQC/stm32f4xx_hal_flash_ramfunc.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_gpio.o b/MDK-ARM/VOQC/stm32f4xx_hal_gpio.o index 6d4c7be..63ed132 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_gpio.o and b/MDK-ARM/VOQC/stm32f4xx_hal_gpio.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_i2c.o b/MDK-ARM/VOQC/stm32f4xx_hal_i2c.o index 75fbfbf..bc3d095 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_i2c.o and b/MDK-ARM/VOQC/stm32f4xx_hal_i2c.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_i2c_ex.o b/MDK-ARM/VOQC/stm32f4xx_hal_i2c_ex.o index d5667fb..4727c0e 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_i2c_ex.o and b/MDK-ARM/VOQC/stm32f4xx_hal_i2c_ex.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_msp.o b/MDK-ARM/VOQC/stm32f4xx_hal_msp.o index bc24c00..51c50be 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_msp.o and b/MDK-ARM/VOQC/stm32f4xx_hal_msp.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_pwr.o b/MDK-ARM/VOQC/stm32f4xx_hal_pwr.o index 9a41136..be7cbd6 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_pwr.o and b/MDK-ARM/VOQC/stm32f4xx_hal_pwr.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_pwr_ex.o b/MDK-ARM/VOQC/stm32f4xx_hal_pwr_ex.o index 19b9bef..17b3ddc 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_pwr_ex.o and b/MDK-ARM/VOQC/stm32f4xx_hal_pwr_ex.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_rcc.o b/MDK-ARM/VOQC/stm32f4xx_hal_rcc.o index c6651c8..dcd75a9 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_rcc.o and b/MDK-ARM/VOQC/stm32f4xx_hal_rcc.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_rcc_ex.o b/MDK-ARM/VOQC/stm32f4xx_hal_rcc_ex.o index 7635b5a..3c3835d 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_rcc_ex.o and b/MDK-ARM/VOQC/stm32f4xx_hal_rcc_ex.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_spi.o b/MDK-ARM/VOQC/stm32f4xx_hal_spi.o index 17e50dc..db6bc2d 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_spi.o and b/MDK-ARM/VOQC/stm32f4xx_hal_spi.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_tim.o b/MDK-ARM/VOQC/stm32f4xx_hal_tim.o index 6c7ca0e..2cd5e2b 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_tim.o and b/MDK-ARM/VOQC/stm32f4xx_hal_tim.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_tim_ex.o b/MDK-ARM/VOQC/stm32f4xx_hal_tim_ex.o index f9fea58..3311a6c 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_tim_ex.o and b/MDK-ARM/VOQC/stm32f4xx_hal_tim_ex.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_uart.o b/MDK-ARM/VOQC/stm32f4xx_hal_uart.o index 4b0f864..23bd72b 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_uart.o and b/MDK-ARM/VOQC/stm32f4xx_hal_uart.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_it.o b/MDK-ARM/VOQC/stm32f4xx_it.o index 04abe39..908949a 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_it.o and b/MDK-ARM/VOQC/stm32f4xx_it.o differ diff --git a/MDK-ARM/VOQC/stm32f4xx_ll_adc.o b/MDK-ARM/VOQC/stm32f4xx_ll_adc.o index b009514..e5fd04e 100644 Binary files a/MDK-ARM/VOQC/stm32f4xx_ll_adc.o and b/MDK-ARM/VOQC/stm32f4xx_ll_adc.o differ diff --git a/MDK-ARM/VOQC/system_stm32f4xx.o b/MDK-ARM/VOQC/system_stm32f4xx.o index dc239a6..5aab1be 100644 Binary files a/MDK-ARM/VOQC/system_stm32f4xx.o and b/MDK-ARM/VOQC/system_stm32f4xx.o differ diff --git a/MDK-ARM/VOQC/tim.o b/MDK-ARM/VOQC/tim.o index d8bed6e..b0ff336 100644 Binary files a/MDK-ARM/VOQC/tim.o and b/MDK-ARM/VOQC/tim.o differ diff --git a/MDK-ARM/VOQC/timer.o b/MDK-ARM/VOQC/timer.o index 5c939fe..9a3fb4f 100644 Binary files a/MDK-ARM/VOQC/timer.o and b/MDK-ARM/VOQC/timer.o differ diff --git a/MDK-ARM/VOQC/uarts.o b/MDK-ARM/VOQC/uarts.o index 82ab5ba..0de17be 100644 Binary files a/MDK-ARM/VOQC/uarts.o and b/MDK-ARM/VOQC/uarts.o differ diff --git a/MDK-ARM/VOQC/usart.o b/MDK-ARM/VOQC/usart.o index 0bdfc2b..194b9ec 100644 Binary files a/MDK-ARM/VOQC/usart.o and b/MDK-ARM/VOQC/usart.o differ diff --git a/users/Src/provalctrl.c b/users/Src/provalctrl.c index d46af84..b786ff2 100644 --- a/users/Src/provalctrl.c +++ b/users/Src/provalctrl.c @@ -33,8 +33,8 @@ void prov_init(void) //不同比例阀的初始参数不一样 pv_one.Kp = data_rd[0]; //比例系数 pv_one.Ti = (data_rd[1] == 0)?(1000000):(data_rd[1]); //积分时间，位于分母 pv_one.Ing = 0; //积分输出 - pv_one.Ing_max = 10000; //积分上限 - pv_one.Ing_min = -10000; //积分下限 + pv_one.Ing_max = 5000; //积分上限 + pv_one.Ing_min = -5000; //积分下限 pv_one.Ing_sum = 0; //偏差求和 pv_one.Td = data_rd[2]; //微分时间 pv_one.Ts = 0.05; //采样周期，50ms @@ -77,8 +77,8 @@ void prov_init(void) //不同比例阀的初始参数不一样 pv_two.Kp = data_rd[0]; pv_two.Ti = (data_rd[1] == 0)?(1000000):(data_rd[1]); //积分时间 pv_two.Ing = 0; - pv_two.Ing_max = 10000; - pv_two.Ing_min = -10000; + pv_two.Ing_max = 5000; + pv_two.Ing_min = -5000; pv_two.Ing_sum = 0; pv_two.Td = data_rd[2]; pv_two.Ts = 0.05; //采样周期，50ms @@ -166,64 +166,83 @@ float abs_bias(float bias) //pid控制 +float beta_in = 0, beta_out = 0; //变速积分 void prov_calibrate_pid(propotion_valve *pvx) { if( (abs_bias(pvx->bias) > pvx->bias_area ) && (abs_bias(pvx->bias) < BIAS_MAX) ) //误差进入目标±BIAS_MAX%以内后再进行控制 { - if( (pvx->Ing_sum >= pvx->Ing_min) && (pvx->Ing_sum <= pvx->Ing_max) ) //积分累加与限幅 + beta_in = ( abs_bias(pvx->bias) + BIAS_MAX * (float)1.25 ) / ( BIAS_MAX ); //变速积分 + beta_out = ( abs_bias(pvx->bias) + BIAS_MAX/2 ) / ( BIAS_MAX ); //变速积分 + + switch(pvx->gas_direction) //根据气体方向对输出范围做补偿 { - pvx->Ing_sum += pvx->bias; //偏差求和 - }else - { - pvx->Ing_sum = (pvx->Ing_sum > 0)?(pvx->Ing_max):(pvx->Ing_min); + case GAS_IN: + { + if( (pvx->Ing_sum >= pvx->Ing_min) && (pvx->Ing_sum <= pvx->Ing_max) ) //积分累加与限幅 + { + pvx->Ing_sum += pvx->bias * beta_in; //偏差求和 + }else + { + pvx->Ing_sum = (pvx->Ing_sum > 0)?(pvx->Ing_max):(pvx->Ing_min); + } + + pvx->Ing = ( pvx->Ts / pvx->Ti ) * pvx->Ing_sum; //积分项 + + pvx->Div = ( pvx->Td / pvx->Ts ) * ( pvx->bias - pvx->bias_previous ); //微分项 + + pvx->pidout = pvx->Kp*( pvx->bias + pvx->Ing + pvx->Div ); //pid输出 + pvx->current_input = (pvx->pidout/100) * (pvx->input_max - pvx->input_min); + } + break; + + case GAS_OUT: + { + if( (pvx->Ing_sum >= pvx->Ing_min) && (pvx->Ing_sum <= pvx->Ing_max) ) //积分累加与限幅 + { + pvx->Ing_sum += pvx->bias * beta_out; //偏差求和 + }else + { + pvx->Ing_sum = (pvx->Ing_sum > 0)?(pvx->Ing_max):(pvx->Ing_min); + } + pvx->Ing = ( pvx->Ts / pvx->Ti ) * pvx->Ing_sum; //积分项 + + pvx->Div = ( pvx->Td / pvx->Ts ) * ( pvx->bias - pvx->bias_previous ); //微分项 + + pvx->pidout = pvx->Kp*( pvx->bias + pvx->Ing + pvx->Div ); //pid输出 + pvx->current_input = (pvx->pidout/100) * (pvx->input_max - pvx->input_min); + } + break; + + default: + { + } + break; } - pvx->Ing = ( pvx->Ts / pvx->Ti ) * pvx->Ing_sum; //积分项 - - pvx->Div = ( pvx->Td / pvx->Ts ) * ( pvx->bias - pvx->bias_previous ); //微分项 - - pvx->pidout = pvx->Kp*( pvx->bias + pvx->Ing + pvx->Div ); //pid输出 - pvx->current_input = (pvx->pidout/100) * (pvx->input_max - pvx->input_min); pvx->bias_previous = pvx->bias; //更新前一个时刻的偏差 -// if(pvx->slow_down_flg == 1) //是否已经减速过 -// { - pvx->current_input = (pvx->current_input < pvx->pidout_max)?(pvx->current_input):(pvx->pidout_max); //pid输出限幅 - pvx->current_input = (pvx->current_input > pvx->pidout_min)?(pvx->current_input):(pvx->pidout_min); -// }else -// { -// switch(pvx->gas_direction) //根据气体方向对输出范围做补偿 -// { -// case GAS_IN: -// { + pvx->current_input = (pvx->current_input < pvx->pidout_max)?(pvx->current_input):(pvx->pidout_max); //pid输出限幅 + pvx->current_input = (pvx->current_input > pvx->pidout_min)?(pvx->current_input):(pvx->pidout_min); -// } -// break; -// -// case GAS_OUT: -// { - -// } -// break; -// -// default: -// { -// } -// break; -// } - if( abs_bias(pvx->previous_pressure[0] - pvx->previous_pressure[SLDW_PRES_OUT - 1]) <= 10 ) - { - pvx->slow_down_flg = 1; - } -// } + if( abs_bias(pvx->previous_pressure[0] - pvx->previous_pressure[SLDW_PRES_OUT - 1]) <= 10 ) //判断是否趋于稳定 + { + pvx->slow_down_flg = 1; + } pvx->current_input = (pvx->current_input < pvx->input_max)?(pvx->current_input):(pvx->input_max); //dac输出限幅 pvx->current_input = (pvx->current_input > pvx->input_min)?(pvx->current_input):(pvx->input_min); + pvx->current_input = (pvx->target_current < pvx->input_max*(float)(0.995))?(pvx->current_input):(pvx->input_max); //小信号切除 + if( pvx->target_current <= pvx->input_min*(float)(1.005) ) + { + pvx->current_input = pvx->input_min; + pvx->Ing_sum = pvx->input_min / pvx->Kp / ( pvx->Ts / pvx->Ti ); + } + pvx->pvout(pvx->current_input); //dac输出 - }else + }else if(abs_bias(pvx->bias) >= BIAS_MAX) { - + pvx->Ing_sum = pvx->current_input / pvx->Kp / ( pvx->Ts / pvx->Ti ); //预估积分值，改善滞后 } } @@ -545,6 +564,8 @@ void prov_adj(propotion_valve *pvx, prov_adjust *adj_pvx) pvx->Ti = (float)0.5 * adj_pvx->relay_Tc/1000 / 10; pvx->Td = (float)0.12 * adj_pvx->relay_Tc/1000; + pvx->Ing_sum = 0; + switch(pvx->tag) {