diff --git a/Core/Src/main.c b/Core/Src/main.c index 0c2c44f..fb7fee8 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -122,8 +122,6 @@ int main(void) modbus_rtu_init(); ee_io_init(); prov_init(); //比例阀初始化 - prov_adj_init(); //比例阀整定参数初始化，继电反馈 - prov_adj_section_init(); //比例阀整定参数初始化，分段式 /* USER CODE END 2 */ diff --git a/MDK-ARM/VOQC.uvguix.admin b/MDK-ARM/VOQC.uvguix.admin index 4517196..d1d3e88 100644 --- a/MDK-ARM/VOQC.uvguix.admin +++ b/MDK-ARM/VOQC.uvguix.admin @@ -46,7 +46,7 @@ 1936 Watch 1 - 156 133 133 + 200 133 133 1937 @@ -111,7 +111,7 @@ 0 723 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000004000000010000000100000064433A5C55736572735C61646D696E5C4465736B746F705C77756A756E6368616F5C30305F50726F6A656374735C30325F4163747561746F722054657374696E675C30305F436F64655C30305F4E65775C564F51435C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF6B433A5C55736572735C61646D696E5C4465736B746F705C77756A756E6368616F5C30305F50726F6A656374735C30325F4163747561746F722054657374696E675C30305F436F64655C30305F4E65775C564F51435C75736572735C5372635C70726F76616C6374726C2E63000000000C70726F76616C6374726C2E6300000000FFDC7800FFFFFFFF6B433A5C55736572735C61646D696E5C4465736B746F705C77756A756E6368616F5C30305F50726F6A656374735C30325F4163747561746F722054657374696E675C30305F436F64655C30305F4E65775C564F51435C75736572735C496E635C70726F76616C6374726C2E68000000000C70726F76616C6374726C2E6800000000BECEA100FFFFFFFF72433A5C55736572735C61646D696E5C4465736B746F705C77756A756E6368616F5C30305F50726F6A656374735C30325F4163747561746F722054657374696E675C30305F436F64655C30305F4E65775C564F51435C4D444B2D41524D5C737461727475705F73746D33326634303778782E730000000015737461727475705F73746D33326634303778782E7300000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000FF00000066000000A0050000DD020000 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000004000000000000000100000064433A5C55736572735C61646D696E5C4465736B746F705C77756A756E6368616F5C30305F50726F6A656374735C30325F4163747561746F722054657374696E675C30305F436F64655C30305F4E65775C564F51435C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF6B433A5C55736572735C61646D696E5C4465736B746F705C77756A756E6368616F5C30305F50726F6A656374735C30325F4163747561746F722054657374696E675C30305F436F64655C30305F4E65775C564F51435C75736572735C5372635C70726F76616C6374726C2E63000000000C70726F76616C6374726C2E6300000000FFDC7800FFFFFFFF6B433A5C55736572735C61646D696E5C4465736B746F705C77756A756E6368616F5C30305F50726F6A656374735C30325F4163747561746F722054657374696E675C30305F436F64655C30305F4E65775C564F51435C75736572735C496E635C70726F76616C6374726C2E68000000000C70726F76616C6374726C2E6800000000BECEA100FFFFFFFF72433A5C55736572735C61646D696E5C4465736B746F705C77756A756E6368616F5C30305F50726F6A656374735C30325F4163747561746F722054657374696E675C30305F436F64655C30305F4E65775C564F51435C4D444B2D41524D5C737461727475705F73746D33326634303778782E730000000015737461727475705F73746D33326634303778782E7300000000F0A0A100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000FF00000066000000A0050000DD020000 @@ -1806,7 +1806,7 @@ File 2550 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000043936303096000000000000000100043936303000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000043936303096000000000000000100043936303000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 968 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000004564F51439600000000000000010004564F5143000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000004564F51439600000000000000010004564F5143000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3547,7 +3547,7 @@ File 2550 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000043936303096000000000000000100043936303000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000043936303096000000000000000100043936303000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3563,7 +3563,7 @@ Build 955 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3603,30 +3603,30 @@ 0 100 - 1 + 0 ../Core/Src/main.c - 28 - 81 - 87 + 17 + 102 + 120 1 0 ..\users\Src\provalctrl.c - 29 - 763 - 765 + 0 + 677 + 703 1 0 ../users/Inc/provalctrl.h - 39 - 1 - 25 + 21 + 81 + 116 1 0 diff --git a/MDK-ARM/VOQC.uvoptx b/MDK-ARM/VOQC.uvoptx index 17dee62..0330ac1 100644 --- a/MDK-ARM/VOQC.uvoptx +++ b/MDK-ARM/VOQC.uvoptx @@ -200,6 +200,11 @@ 1 adj_pv2 + + 9 + 1 + astep_s + diff --git a/MDK-ARM/VOQC/VOQC.axf b/MDK-ARM/VOQC/VOQC.axf index d2be3bd..0fc0d81 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 244e2e6..59f0096 100644 --- a/MDK-ARM/VOQC/VOQC.build_log.htm +++ b/MDK-ARM/VOQC/VOQC.build_log.htm @@ -27,12 +27,6 @@ Project File Date: 09/12/2024

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\Bin' Build target 'VOQC' -compiling main.c... -compiling ads1220.c... -compiling provalctrl.c... -linking... -Program Size: Code=33662 RO-data=458 RW-data=416 ZI-data=6880 -FromELF: creating hex file... "VOQC\VOQC.axf" - 0 Error(s), 0 Warning(s).

Software Packages used:

@@ -56,7 +50,7 @@ Package Vendor: Keil

Collection of Component Files used:

* Component: ARM::CMSIS:CORE@5.6.0 -Build Time Elapsed: 00:00:12 +Build Time Elapsed: 00:00:01 diff --git a/MDK-ARM/VOQC/VOQC.hex b/MDK-ARM/VOQC/VOQC.hex index e29b871..1bd388e 100644 --- a/MDK-ARM/VOQC/VOQC.hex +++ b/MDK-ARM/VOQC/VOQC.hex @@ -26,8 +26,8 @@ :10018000830200088302000800F002F800F05CF827 :100190000AA090E8000C82448344AAF10107DA45E2 :1001A00001D100F051F8AFF2090EBAE80F0013F0D8 -:1001B000010F18BFFB1A43F0010318476C830000BE -:1001C0008C8300000A444FF0000C10F8013B13F040 +:1001B000010F18BFFB1A43F001031847DC8200004F +:1001C000FC8200000A444FF0000C10F8013B13F0D1 :1001D000070408BF10F8014B1D1108BF10F8015BA0 :1001E000641E05D010F8016B641E01F8016BF9D193 :1001F00013F0080F1EBF10F8014BAD1C0C1B09D1EA @@ -35,7 +35,7 @@ :1002100001F8016B6D1EF9D59142D6D370470000ED :100220000023002400250026103A28BF78C1FBD8FF :10023000520728BF30C148BF0B6070471FB508F098 -:100240005DF91FBD10B510BD00F070F91146FFF744 +:1002400015F91FBD10B510BD00F070F91146FFF78C :10025000F5FF05F0B3FD00F08EF903B4FFF7F2FFF0 :1002600003BC04F051F900000948804709480047E1 :10027000FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE756 @@ -139,10 +139,10 @@ :100890000846006800F40000F8B108460068C0434C :1008A000086008460068C0F3160008600846006843 :1008B000401C08600846006840420860084600681E -:1008C00007F0CBFB41EC180B9FED120B53EC102BF8 -:1008D00007F02CFC0B4A03C20DE00D48006807F03E -:1008E000BCFB41EC180B9FED0B0B53EC102B07F0EE -:1008F0001DFC044A03C2034890ED000B5DE70000B5 +:1008C00007F083FB41EC180B9FED120B53EC102B40 +:1008D00007F0E4FB0B4A03C20DE00D48006807F087 +:1008E00074FB41EC180B9FED0B0B53EC102B07F036 +:1008F000D5FB044A03C2034890ED000B5DE70000FE :1009000020000020180000200004024010000020F9 :100910001400002085F90F270088433F70B5044676 :100920000D4600221021164800F036FF0CE0154855 @@ -160,7 +160,7 @@ :1009E00000F0B4FB10BD000094050020014608781B :1009F00010381823B0FBF3F20848805CC865032A5E :100A000005D908686FF30900001D886503E00868D0 -:100A10006FF309008865886D70470000068500083F +:100A10006FF309008865886D7047000076840008D0 :100A2000014600208A6A8B69CBB932B1012A0DD008 :100A3000022A03D0032A10D10EE000BFCB6A03F0D4 :100A40008073B3F1807F00D1012007E0CB6AB3F15E @@ -186,11 +186,11 @@ :100B800002EB5474E410A2EBC4050124AC401C40F9 :100B900014B101220A7001E000220A7030BD000089 :100BA0007F00002010B51648002101600171082166 -:100BB000302006F0FEFD022004F0FEFC092006F0C5 -:100BC000E7FD0F49C8700A2006F0E2FD0C490871E4 -:100BD0000921302006F0EDFD032004F0EDFC062095 -:100BE00006F0D6FD06490870072006F0D1FD04493D -:100BF0004870082006F0CCFD01498870084610BDF9 +:100BB000302006F0B6FD022004F0FEFC092006F00D +:100BC0009FFD0F49C8700A2006F09AFD0C49087174 +:100BD0000921302006F0A5FD032004F0EDFC0620DD +:100BE00006F08EFD06490870072006F089FD0449CD +:100BF0004870082006F084FD01498870084610BD41 :100C00006000002038B502460020009000BF92F836 :100C10003C00012801D1022038BD012082F83C00AF :100C200000BF0868092816D91068C0680C780A3C0B @@ -466,13 +466,13 @@ :101D00000D48006820F46040216940EAC1000A499A :101D1000086000F03FF808490968C1F30311074A59 :101D2000515CC8400649086006480068FFF796FE07 -:101D300000204CE7003C0240083802400E850008B5 +:101D300000204CE7003C0240083802407E84000846 :101D40000C000020040000200148006870470000DB :101D50000C00002000B5FFF7F7FF04490968C1F344 :101D60008221034A515CC84000BD0000083802408F -:101D70001E85000800B5FFF7E7FF04490968C1F3B5 +:101D70008E84000800B5FFF7E7FF04490968C1F346 :101D80004231034A515CC84000BD0000083802409F -:101D90001E8500082DE9F047002400250026A146F5 +:101D90008E8400082DE9F047002400250026A14686 :101DA0002548006800F00C0020B1042805D0082860 :101DB0003AD105E0DFF8849039E0DFF8849036E02E :101DC0001D48001F006800F03F041B48001F00680A @@ -693,9 +693,9 @@ :102B300033F806F02000202809D105F020002028D5 :102B400005D1C043216808612046FFF78CFC70BDA9 :102B50007047704710B504460C48844201D104F018 -:102B600007FD0B4884420FD16FF001000849096846 +:102B6000BFFC0B4884420FD16FF00100084909688F :102B700008610748FFF79CFD064880880549C88022 -:102B80000020888003F030FB10BD00003C030020D3 +:102B80000020888003F02CFB10BD00003C030020D7 :102B900084030020941300207047704770470000A2 :102BA0002DE9F84F0446206805682068C66820684B :102BB00047694FF00009CA4605F00F09B9F1000F47 @@ -817,7 +817,7 @@ :1032F00070B504460D46164694F8420020280BD1BE :1033000005B10EB9012070BD002020633246294668 :10331000204600F08DFFF6E70220F4E710B50446E2 -:1033200003492068884201D102F0AAFF10BD0000C5 +:1033200003492068884201D102F0A6FF10BD0000C9 :10333000001001402DE9F84F04460E461746994605 :103340004FF0000A94F84100202850D106B117B977 :103350000120BDE8F88F00206064212084F841003E @@ -1123,16 +1123,16 @@ :10461000A149088200219F4A1160516001209749F9 :104620000870912000F0D6F924E100F0B1F9944926 :10463000924A127841F82200904A127851F82200EA -:1046400003F00BFD41EC1A0B9FED940B53EC102B78 -:1046500003F04EFB41EC190B9FED920B53EC102B2A -:1046600000E049E003F062FD41EC180B03F098FC18 +:1046400003F0C3FC41EC1A0B9FED940B53EC102BC1 +:1046500003F006FB41EC190B9FED920B53EC102B72 +:1046600000E049E003F01AFD41EC180B03F050FCA8 :104670008249097801EB8101844A02EBC1018B4A2E :10468000126841F8220089480068401C8749086088 :1046900008460068092801DD00200860002010E0BD :1046A0007649097801EB8101784A02EBC10151F8A2 :1046B0002010CA17774C18CCC9186241754B06C335 -:1046C000401C0A28ECDB734903C903F0DDFC9FEDB5 -:1046D000780B53EC102B03F00BFB03F091FC6E49AD +:1046C000401C0A28ECDB734903C903F095FC9FEDFD +:1046D000780B53EC102B03F0C3FA03F049FC6E493E :1046E000488200216B4A11605160022063490870C2 :1046F000A12000F06FF9BDE000F04AF960495F4A7F :10470000127841F8220008465C49097850F82100E7 @@ -1147,10 +1147,10 @@ :104790000A2200233F4903C9FBF7FFFD3E498882F7 :1047A00000213C4A11605160032034490870B12057 :1047B00000F010F95EE000F0EBF831492F4A127872 -:1047C00041F822002D4A127851F8220003F045FCEE -:1047D00041EC1A0B9FED310B53EC102B03F088FAD0 -:1047E00041EC190B9FED2F0B53EC102B03F09EFCAB -:1047F00041EC180B03F0D4FB2049097801EB81014F +:1047C00041F822002D4A127851F8220003F0FDFB37 +:1047D00041EC1A0B9FED310B53EC102B03F040FA18 +:1047E00041EC190B9FED2F0B53EC102B03F056FCF3 +:1047F00041EC180B03F08CFB2049097801EB810197 :10480000224A02EBC101294A126841F822002B48D2 :104810000068401C2949086008460068092801DD35 :1048200000200860002010E01449097801EB8101A4 @@ -1198,54 +1198,54 @@ :104AC00010B52DED0A8BCC480068082835D2DFE8F8 :104AD00000F004356697C8FCFAF90120FBF758FE90 :104AE000B0EE40CAF0EE60CA9FEDC40B53EC102B41 -:104AF00051EC1C0B03F01AFB41EC1B0B9FEDC10B9F -:104B000053EC102B03F0F4F841EC1A0B9FEDBF0BA4 -:104B100053EC102B03F008FC41EC190B9FEDBD0B7F -:104B200053EC102B03F0E4F841EC180B03F068FA97 +:104AF00051EC1C0B03F0D2FA41EC1B0B9FEDC10BE8 +:104B000053EC102B03F0ACF841EC1A0B9FEDBF0BEC +:104B100053EC102B03F0C0FB41EC190B9FEDBD0BC8 +:104B200053EC102B03F09CF841EC180B03F020FA27 :104B3000BA4908800120B049086059E10220FBF71A :104B400027FEB0EE40CAF0EE60CA9FEDAC0B53EC0E -:104B5000102B51EC1C0B03F0E9FA41EC1B0B9FED01 -:104B6000A90B53EC102B03F0C3F841EC1A0B9FED8B -:104B7000A70B53EC102B03F0D7FB41EC190B9FED67 -:104B8000A50B53EC102B03F0B3F841EC180B03F01A -:104B900037FAA249488002209749086028E103209B +:104B5000102B51EC1C0B03F0A1FA41EC1B0B9FED49 +:104B6000A90B53EC102B03F07BF841EC1A0B9FEDD3 +:104B7000A70B53EC102B03F08FFB41EC190B9FEDAF +:104B8000A50B53EC102B03F06BF841EC180B03F062 +:104B9000EFF9A249488002209749086028E10320E4 :104BA000FBF7F6FDB0EE40CAF0EE60CA9FED930B46 -:104BB00053EC102B51EC1C0B03F0B8FA41EC1B0B1F -:104BC0009FED900B53EC102B03F092F841EC1A0B75 -:104BD0009FED8E0B53EC102B03F0A6FB41EC190B51 -:104BE0009FED8C0B53EC102B03F082F841EC180B6B -:104BF00003F006FA8949888003207F490860F7E0BE +:104BB00053EC102B51EC1C0B03F070FA41EC1B0B67 +:104BC0009FED900B53EC102B03F04AF841EC1A0BBD +:104BD0009FED8E0B53EC102B03F05EFB41EC190B99 +:104BE0009FED8C0B53EC102B03F03AF841EC180BB3 +:104BF00003F0BEF98949888003207F490860F7E007 :104C00000420FBF7C5FDB0EE40CAF0EE60CA9FED90 -:104C10007B0B53EC102B51EC1C0B03F087FA41EC8F -:104C20001B0B9FED780B53EC102B03F061F841EC5C -:104C30001A0B9FED760B53EC102B03F075FB41EC38 -:104C4000190B9FED740B53EC102B03F051F841EC52 -:104C5000180B03F0D5F97149C88004206649086033 +:104C10007B0B53EC102B51EC1C0B03F03FFA41ECD7 +:104C20001B0B9FED780B53EC102B03F019F841ECA4 +:104C30001A0B9FED760B53EC102B03F02DFB41EC80 +:104C4000190B9FED740B53EC102B03F009F841EC9A +:104C5000180B03F08DF97149C8800420664908607B :104C6000C6E00520FBF794FDB0EE40CAF0EE60CA46 -:104C70009FED620B53EC102B51EC1C0B03F056FA1A -:104C800041EC1B0B9FED5F0B53EC102B03F030F846 -:104C900041EC1A0B9FED5D0B53EC102B03F044FB22 -:104CA00041EC190B9FED5B0B53EC102B03F020F83C -:104CB00041EC180B03F0A4F95849088105204E492E +:104C70009FED620B53EC102B51EC1C0B03F00EFA62 +:104C800041EC1B0B9FED5F0B53EC102B02F0E8FF88 +:104C900041EC1A0B9FED5D0B53EC102B03F0FCFA6B +:104CA00041EC190B9FED5B0B53EC102B02F0D8FF7E +:104CB00041EC180B03F05CF95849088105204E4976 :104CC000086095E063E031E0FFE70620FBF760FD58 :104CD000B0EE40CAF0EE60CA9FED480B53EC102BCB -:104CE00051EC1C0B03F022FA41EC1B0B9FED450B22 -:104CF00053EC102B02F0FCFF41EC1A0B9FED430B21 -:104D000053EC102B03F010FB41EC190B9FED410B02 -:104D100053EC102B02F0ECFF41EC180B03F070F990 +:104CE00051EC1C0B03F0DAF941EC1B0B9FED450B6B +:104CF00053EC102B02F0B4FF41EC1A0B9FED430B69 +:104D000053EC102B03F0C8FA41EC190B9FED410B4B +:104D100053EC102B02F0A4FF41EC180B03F028F920 :104D20003E49488106203449086061E00720FBF7CE :104D30002FFDB0EE40CAF0EE60CA9FED300B53EC91 -:104D4000102B51EC1C0B03F0F1F941EC190B9FED0A -:104D50002D0B53EC102B02F0CBFF41EC1B0B9FED06 -:104D60002B0B53EC102B03F0DFFA41EC180B9FEDEB -:104D7000290B53EC102B02F0BBFF41EC1A0B03F094 -:104D80003FF92649888107201B49086030E0002050 +:104D4000102B51EC1C0B03F0A9F941EC190B9FED52 +:104D50002D0B53EC102B02F083FF41EC1B0B9FED4E +:104D60002B0B53EC102B03F097FA41EC180B9FED33 +:104D7000290B53EC102B02F073FF41EC1A0B03F0DC +:104D8000F7F82649888107201B49086030E0002099 :104D9000FBF7FEFCB0EE40CAF0EE60CA9FED170BC9 -:104DA00053EC102B51EC1C0B03F0C0F941EC1B0B26 -:104DB0009FED140B53EC102B02F09AFF41EC1A0BF1 -:104DC0009FED120B53EC102B03F0AEFA41EC180BD5 -:104DD0009FED100B53EC102B02F08AFF41EC190BE6 -:104DE00003F00EF90D49C88100200349086000BF97 +:104DA00053EC102B51EC1C0B03F078F941EC1B0B6E +:104DB0009FED140B53EC102B02F052FF41EC1A0B39 +:104DC0009FED120B53EC102B03F066FA41EC180B1D +:104DD0009FED100B53EC102B02F042FF41EC190B2E +:104DE00003F0C6F80D49C88100200349086000BFE0 :104DF00000BFBDEC0A8B10BD2400002000000000A5 :104E0000000024403D0AD7A3703DEA3F00000000A7 :104E100000C06240AE47E17A14AEEF3FD0090020F7 @@ -1277,12 +1277,12 @@ :104FB00080EE201A964890ED000AB4EE401AF1EE09 :104FC00010FA12D08F48408800EE100AB8EE400A5E :104FD000DFED8D0A80EE201A8D4880ED001A8D4895 -:104FE0008B4991ED000A01F043FF8648808800EE6E +:104FE0008B4991ED000A01F0FBFE8648808800EEB7 :104FF000100AB8EE400ADFED840A80EE201A8648D7 :1050000090ED000AB4EE401AF1EE10FA12D07D488D :10501000808800EE100AB8EE400ADFED7B0A80EED1 :10502000201A7D4880ED001A7C487B4991ED000AEA -:1050300001F01EFF7A48C07800F04000402806D1F9 +:1050300001F0D6FE7A48C07800F04000402806D142 :1050400078480078052802D1012072490870744818 :10505000C07800F02000202806D17248007805288A :1050600002D101206D4908706F48006801287DD188 @@ -1309,15 +1309,15 @@ :1051B0000C0A30EE600A80ED130A224800680128CC :1051C0001ED100201F4908601548007800F0030038 :1051D000032807D111480078012803D01A490D4847 -:1051E00001F04EFC0E48007800F00C000C2807D1AE -:1051F00008480078012803D01449084801F040FC11 +:1051E00001F004FC0E48007800F00C000C2807D1F8 +:1051F00008480078012803D01449084801F0F6FB5C :1052000010BD00008600002000007A4470010020DC :1052100074010020A8130020780100203C14002015 :105220007A0000208001002038010020D0090020F1 :1052300000007A460000FA447C010020000061442E :105240000000C84240010020E8140020841500201E :1052500010B50F48006801280AD100200C490860E9 -:1052600000F0F4FDFFF760F9FFF72AFCFFF772F991 +:1052600000F0F0FDFFF760F9FFF72AFCFFF772F995 :105270000848006801280AD100200649086000F0AB :10528000ADFA05490880084600880449C88410BD65 :10529000F800002010010020EC000020D0090020C0 @@ -1502,637 +1502,628 @@ :105DC000FDF7E2FEFDF7ECFBFDF796FBFDF75CFB54 :105DD000FDF7F8FCFDF714FDFDF734FDFDF7BCFD04 :105DE000FDF7D6FDFDF7F0FDFDF70AFEFDF724FEF9 -:105DF000FDF766FDFDF78AFD1348FCF705FCFFF78C +:105DF000FDF766FDFDF78AFD1148FCF705FCFFF78E :105E00005BFEFEF79BFBFFF70BF8FEF759FDFFF774 -:105E1000B3FB00F0EFF8FFF717FDFEF705FB00F00E -:105E200005FAFFF7CBFD00F063FE00F06BFA00F01F -:105E3000FDFB07E0FFF7FCFBFFF70AFAFFF77EF830 -:105E4000FFF766FEF6E700003C03002010B52DEDDD -:105E5000028B9FED5C0AB0EE408AFAF7A3FE04467F -:105E60002078594908600846006800020860607898 -:105E70000968084354490860084600680002086041 -:105E8000A078096808435049086008460068B0F5E2 -:105E9000000F0FDB08460068A0F1807000EE100ACA -:105EA000B8EEC00ADFED490A80EE201A484880EDBE -:105EB000001A0BE0444890ED000AB8EEC00ADFED8E -:105EC000430A80EE201A424880ED001A4048D0ED87 -:105ED000000A9FED400A9FED401A01EE200AF2EE03 -:105EE000080A80EE201A3D4880ED001A90ED000A65 -:105EF000F2EE040A20EE200A39480078401E00EB3A -:105F00008000384901EB00103749097800EB810027 -:105F100080ED000A32480078401C3149087008467C -:105F2000007803282FDD012251023048FBF734FCB2 -:105F3000002026E09FED230AB0EE408A00210EE00B -:105F400000EB8002274B03EB021202EB810292ED81 -:105F5000000A30EE080AB0EE408A4A1CD1B2142979 -:105F6000EEDBB3EE040AC8EE000ABCEEE00A10EE67 -:105F7000101A8AB200F10D011D4B23F81120411CAB -:105F8000C8B20628D6DB1648007806280DDD0120A9 -:105F90001349087014480078401C134908700846DB -:105FA0000078132801DD002008700D4800780428CF -:105FB00005DA00224FF400710C48FBF7EDFBBDEC55 -:105FC000028B10BD00000000680000200000004BA4 -:105FD0007400002000A00C4600401C466C0000200D -:105FE0005C000020F007002078000020000802403C -:105FF000D009002010B501F087FA00224FF400719B -:106000002A48FBF7C9FB0A20FFF7D6FA01202849E6 -:1060100008708121002001F0CCFB0A20FFF7CCFAA8 -:106020000220234908708121002001F0C2FB0A20D0 -:10603000FFF7C2FA03201E4908708121002001F0F9 -:10604000B8FB0A20FFF7B8FA012251021748FBF704 -:10605000A3FB0A20FFF7B0FA04201549087081213C -:10606000002001F0A6FB0A20FFF7A6FA0520104940 -:1060700008708121002001F09CFB0A20FFF79CFAA8 -:1060800006200B4908708121002001F092FB0A20B4 -:10609000FFF792FA012006490870002241020348E6 -:1060A000FBF77AFB0A20FFF787FA10BD00080240D1 -:1060B0005C0000202DE9F04104460D460CB1022D94 -:1060C00001DABDE8F08126786778012E01D0002E34 -:1060D00048D1052F3AD008DC012F0DD0022F11D066 -:1060E000032F15D0042F37D118E0062F1CD00F2F07 -:1060F00020D0102F30D123E0A81E81B2A01C00F0C8 -:10610000ADFF2EE0A81E81B2A01C01F04FF828E0E0 -:10611000A81E81B2A01C01F0EFF822E0A81E81B2F7 -:10612000A01C01F06FF91CE0A81E81B2A01C01F0B8 -:10613000DBFC16E0A81E81B2A01C01F04BFB10E0B6 -:10614000A81E81B2A01C01F0EBFB0AE0A81E81B2E0 -:10615000A01C01F067FC04E06078012100F004F865 -:1061600000BF00BF00BFACE7F0B599B005460E46D2 -:106170000024002701222146641C0DF8012045F06F -:1061800080022146641C0DF801202146641C0DF894 -:10619000016021466846FDF76DFC0746FAB22146CC -:1061A000641C0DF801203A122146641C0DF80120F0 -:1061B0000B48008AA04201DB204601E00848008A23 -:1061C000074948824A8AC8686946FAF70AF90448C2 -:1061D000428AC168034801F0D1FA19B0F0BD00004D -:1061E00094130020140400202DE9F04100240E48EF -:1061F0000568C488022C01DABDE8F081A01E295C84 -:10620000601E285C41EA0027A01E81B22846FDF7E7 -:1062100031FC0646B74200D0EEE7034AD188106849 -:10622000FFF748FF00BFE7E79413002010B50E48C2 -:106230000E49086000208880C88008720C48C86039 -:106240004FF48060088200204882012209490A48F0 -:10625000FDF74EF86FF0010008490968086107482A -:10626000FCF7D2F910BD0000940A0020941300201E -:10627000940E00205C010020140400208403002000 -:1062800010B51848808840F2FF3188420EDB0020AC -:106290001449888008460068002101604FF6FF73AA -:1062A0000A2211A11448FDF745F814E013480178BB -:1062B0000C4882888088401C0A4B988018460068E9 -:1062C00081540F48FCF7F4F900200D490968486231 -:1062D0000B48FCF799F9012208490748FDF708F82F -:1062E00010BD000094130020E695B0E68DAEE6BA2E -:1062F000A2E587BA00000000140400205C01002021 -:106300008403002000202949087000BF11E09FEDA0 -:10631000280A2649083101EB800181ED000A9FED32 -:10632000240A2249203101EB800181ED000A411C41 -:10633000C8B20528EBDB9FED1F0A1C4880ED010A5F -:106340009FED1B0A80ED0E0A9FED190A80ED0F0AE2 -:106350000020164981F840001749087000BF11E07D -:106360009FED130A1449083101EB800181ED000A09 -:106370009FED0F0A1049203101EB800181ED000AE9 -:10638000411CC8B20528EBDB9FED0A0A0A4880EDE4 -:10639000010A9FED070A80ED0E0A9FED050A80EDC8 -:1063A0000F0A0020044981F840007047E8140020DB -:1063B000000000009A99193E8415002070B505462A -:1063C0000C468E48007805287ED2DFE800F00334C2 -:1063D0007ECEF3008A480068401C40B989480068B6 -:1063E000874908602846B1EE000A00F041FD854863 -:1063F0000068854908600846006881490968401AB4 -:1064000014280BDD4FF0FF307D4908607E4908609D -:106410007A480078401C794908700BE07A48006897 -:1064200077490968401A05D54FF0FF307449086074 -:1064300075490860E0E07548808C00EE100AB8EEFF -:10644000400A7348D0ED000A30EE600AF2EE040A0A -:1064500080EE201A84ED0E1A94ED0E0A9FED6D1A4F -:10646000C0EE010A95ED110A95ED121A30EE411AAF -:1064700095ED120A00EE810A84ED1A0A00201BE055 -:1064800094ED1A0AD5ED120A70EE600A00EE100AB9 -:10649000B8EE400A20EE800AF2EE020A80EE201AE0 -:1064A00095ED120A31EE000A04F1440101EB80017E -:1064B00081ED000A411CC8B20928E1DB4F48007891 -:1064C000401C4E49087097E095E04D480068401C1C -:1064D00080B94C4800684A49086004F144004E49BC -:1064E000097800EB8100D0ED000AB0EE600A284682 -:1064F00000F0BEFC43480068434908600846006855 -:106500003F490968401A94F89810884220DD95EDBB -:106510000B0A04F16C004049097800EB810080ED22 -:10652000000A4FF0FF3036490860374908603A48A2 -:106530000078401C38490870084600780A2813DBA8 -:10654000002008702D480078401C2C4908700BE092 -:106550002D4800682A490968401A05D54FF0FF30D8 -:10656000274908602849086046E025480068401C23 -:1065700018B9244800682249086022480068224966 -:106580000860084600681E490968401A0A2824DD88 -:106590006878012802D002280DD105E09FED1F0A7E -:1065A0001F4880ED000A07E09FED1C0A1D4880EDA2 -:1065B000000A01E01EE000BF00BF4FF0FF301049AD -:1065C00008601149086000202070022028701648D9 -:1065D0000078401C144908700BE00B48006808491B -:1065E0000968401A05D54FF0FF3005490860064993 -:1065F000086001E000E000BF00BF70BD8101002025 -:10660000840100205001002088010020D0090020D2 -:106610007C010020000061448D010020000000008A -:1066200074010020780100208001002000201E4914 -:106630000870B2EE020A084680ED250A0A2081F8A9 -:106640009800002019490870B2EE020A084680ED51 -:10665000250A0A2081F89800002021E09FED140A05 -:106660001149443101EB800181ED000A9FED100AD0 -:106670000D496C3101EB800181ED000A9FED0C0AA0 -:106680000A49443101EB800181ED000A9FED080ABF -:1066900006496C3101EB800181ED000A411CC8B252 -:1066A0000A28DBDB70470000E81400208415002076 -:1066B0000000000010B50446D4ED130AB0EE600AE5 -:1066C000FDF724FFD4ED150AB4EEE00AF1EE10FA5E -:1066D0007EDDD4ED130AB0EE600AFDF717FFF2EE8F -:1066E000040AB4EEE00AF1EE10FA71D2D4ED130A06 -:1066F00060EEA00AB0EE600AFDF708FFF2EE040AB1 -:1067000030EE200AF2EE040A80EE201AD54880ED21 -:10671000001AD4ED130AB0EE600AFDF7F7FEF1EEB1 -:10672000040A30EE200AF2EE040A80EE201ACE4867 -:1067300080ED001A94F8580010B101287ED16BE06A -:1067400094ED1A0AD4ED130AC64890ED001A00EE33 -:10675000810A84ED1A0A94ED1A0AD4ED1B0AB4EEEC -:10676000E00AF1EE10FA02DD94ED1B0A01E094ED6F -:106770001A0A84ED1A0A94ED1A0AD4ED1C0AB4EE32 -:10678000E00AF1EE10FA02D294ED1C0A01E094ED59 -:106790001A0A84ED1A0AD4ED1E0A94ED181A80EE36 -:1067A000810AD4ED1A0A20EE200A84ED190AD4EDEC -:1067B0001D0A94ED1E1A80EE810AD4ED130A94EDA1 -:1067C000141A70EEC10A20EE200A84ED1F0A00E0C0 -:1067D000F9E094ED130AD4ED190A30EE200AD4ED55 -:1067E0001F0A30EE200AD4ED170A20EE200A84EDAD -:1067F000200A94ED200A9FED9D1AC0EE010A94ED47 -:10680000110A94ED121A30EE411A94ED120A00EEBC -:10681000810A84ED100A6CE094ED1A0AD4ED130A93 -:10682000914890ED001A00EE810A84ED1A0A94ED69 -:106830001A0AD4ED1B0AB4EEE00A00E058E0F1EECB -:1068400010FA02DD94ED1B0A01E094ED1A0A84EDC2 -:106850001A0A94ED1A0AD4ED1C0AB4EEE00AF1EE1D -:1068600010FA02D294ED1C0A01E094ED1A0A84EDAC -:106870001A0AD4ED1E0A94ED181A80EE810AD4ED9E -:106880001A0A20EE200A84ED190AD4ED1D0A94EDAF -:106890001E1A80EE810AD4ED130A94ED141A70EEDC -:1068A000C10A20EE200A84ED1F0A94ED130AD4EDEC -:1068B000190A30EE200AD4ED1F0A30EE200AD4ED7A -:1068C000170A20EE200A84ED200A94ED200A9FED9D -:1068D000671AC0EE010A94ED110A94ED121A30EE17 -:1068E000411A94ED120A00EE810A84ED100A00E0CC -:1068F00000BF00BF94ED100AD4ED210AB4EEE00A07 -:10690000F1EE10FA02D294ED100A01E094ED210AA2 -:1069100084ED100A94ED100AD4ED220AB4EEE00AD8 -:10692000F1EE10FA02DD94ED100A01E094ED220A76 -:1069300084ED100A94ED130A84ED140AD4ED010AD3 -:1069400094ED0A1A70EEC10AB0EE600AFDF7DEFDA2 -:10695000F2EE040AB4EEE00AF1EE10FA02D80120D9 -:1069600084F88C0094ED0F0AD4ED110A9FED401AC3 -:1069700060EE810AB4EEE00AF1EE10FA02D294ED74 -:10698000100A01E094ED110A84ED100A94ED0F0A4B -:10699000D4ED120A9FED371A60EE810AB4EEE00AD8 -:1069A000F1EE10FA07D894ED120A84ED100A9FED6B -:1069B000320A84ED1A0AD4ED100AB0EE600AD4F857 -:1069C000900080474DE0D4ED130AB0EE600AFDF769 -:1069D0009DFDF2EE040AB4EEE00AF1EE10FA40DB9F -:1069E00094F8580010B1012839D127E094ED0E0A2F -:1069F0002248D0ED000A9FED1D1A01EE600A94EDC9 -:106A0000171AC0EE010A94ED1E0AD4ED181A80EE92 -:106A1000211A80EE810A84ED1A0A94ED1A0AD4ED47 -:106A20001C0AB4EEE00AF1EE10FA02D294ED1C0A50 -:106A300001E094ED1A0A84ED1A0A11E094ED0E0AB1 -:106A400094ED171AC0EE010A94ED1E1AD4ED181A2F -:106A500081EE210A80EE801A84ED1A1A00E000BF50 -:106A600000BF10BD680100206C0100200000C8427A -:106A700052B87E3FD7A3803F000000006401002091 -:106A800070B505460C46287820B101280ED00228A2 -:106A900025D11BE02078012804D1FFF733FC052025 -:106AA000114908702846FFF705FE19E00F480078E5 -:106AB000042806D1FFF7BAFD0120207000200B4901 -:106AC000087021462846FFF779FC09E02078012864 -:106AD00004D1FFF717FC05200349087000E070BDE2 -:106AE00000BF00BFFBE70000800100208101002003 -:106AF00010B503229D490020FEF7CAFF02209C49E1 -:106B0000087001204870002009E09FED9A0A98491A -:106B1000091D01EB800181ED000A411CC8B20A2861 -:106B2000F3DB9FED940A924880ED0B0A9FED910AEA -:106B300080ED0C0A9FED8F0A80ED0D0A9FED8D0A06 -:106B400080ED0E0A9FED8B0A80ED0F0A9FED890AFA -:106B500080ED100AB1EE000A80ED120AB3EE040ACD -:106B600080ED110A9FED830A80ED130A9FED810AE3 -:106B700080ED140AB6EE000A80ED150A7B4890ED10 -:106B8000000A10EE101A0846FDF79AFC10B19FEDAE -:106B9000790A02E0754890ED000A754880ED170A01 -:106BA000724890ED010AB5EEC00AF1EE10FA02D17A -:106BB0009FED710A02E06D4890ED010A6C4880ED8E -:106BC000180A9FED6C0A80ED190A9FED6C0A80EDA2 -:106BD0001B0A9FED680A80ED1C0A9FED660A80ED96 -:106BE0001A0A624890ED020A614880ED1D0A9FED85 -:106BF000640A80ED1E0A9FED5F0A80ED1F0A9FED7B -:106C00005D0A80ED200A9FED5B0A80ED210A9FED71 -:106C1000590A80ED220A0020554981F88C00594814 -:106C2000C1F890009FED530AD1F8900080470322ED -:106C30004E490C20FEF72CFF022053490870487083 -:106C4000002009E09FED4B0A4F49091D01EB80012F -:106C500081ED000A411CC8B20A28F3DB9FED450A0A -:106C6000494880ED0B0A9FED430A80ED0C0A9FED29 -:106C7000410A80ED0D0A9FED3F0A80ED0E0A9FED5F -:106C80003D0A80ED0F0A9FED3B0A80ED100AB1EE40 -:106C9000000A80ED120AB3EE040A80ED110A9FED9E -:106CA000350A80ED130A9FED330A80ED140AB6EE23 -:106CB000000A80ED150A2D4890ED000A10EE101A1A -:106CC0000846FDF7FDFB10B19FED2A0A02E02748B8 -:106CD00090ED000A2C4880ED170A244890ED010A37 -:106CE000B5EEC00AF1EE10FA02D19FED230A02E0E0 -:106CF0001E4890ED010A244880ED180A9FED1D0AF8 -:106D000080ED190A9FED1D0A80ED1B0A9FED190AFF -:106D100080ED1C0A9FED170A80ED1A0A134890EDCA -:106D2000020A194880ED1D0A9FED150A80ED1E0A22 -:106D30009FED100A80ED1F0A9FED0E0A80ED200ADC -:106D40009FED0C0A80ED210A9FED0A0A80ED220AD0 -:106D500000200D4981F88C000C48C1F890009FED8F -:106D6000050AD1F89000804710BD0000DC14002017 -:106D7000A8130020000000000024744900409C4536 -:106D8000CDCC4C3DA15200083C140020ED5200082F -:106D9000F0EE400A9FED350AB0EE401A90ED240A5D -:106DA000B5EEC00AF1EE10FA02D1BFEE000A70474C -:106DB000002155E000F16C0202EB810292ED000A25 -:106DC000B4EEE00AF1EE10FA3DD800F16C024B1C73 -:106DD00002EB830292ED000AB4EEE00AF1EE10FA43 -:106DE00031DD00F1440202EB830292ED000A00F172 -:106DF000440202EB8102D2ED001A30EE610A00F18A -:106E00006C0202EB8102D2ED001A70EEE11A20EE64 -:106E1000210A00F16C0202EB8302D2ED001A00F1AC -:106E20006C0202EB810292ED002A31EEC22AC0EE22 -:106E3000021A00F1440202EB810292ED000A31EEE7 -:106E4000800AB0EE401A90ED240AB4EEE00AF1EEAA -:106E500010FA03D890ED1A0AB0EE401A4A1CD1B2CB -:106E60000929A7DBB0EE410AA1E7000000000000FD -:106E700010B52DED028BB0EE408A044694ED110A58 -:106E8000B4EEC80AF1EE10FA02DDB0EE480A01E0F5 -:106E900094ED110AB0EE408A94ED120AB4EEC80ADD -:106EA000F1EE10FA02D2B0EE480A01E094ED120AB7 -:106EB000B0EE408A94ED110AD4ED120A30EE600A69 -:106EC000D4ED120A38EE601AC1EE000A9FED5E0A98 -:106ED00020EE800A84ED0E0A94ED0E0A9FED5A1AF8 -:106EE000C0EE010A9FED590A20EE800A84ED0D0ADA -:106EF0006078012802D002286AD134E0D4ED0D0A6E -:106F0000B0EE600A5248FFF743FFB5EEC00AF1EE5B -:106F100010FA07DDD4ED0D0AB0EE600A4C48FFF719 -:106F200037FF01E0B0EE480AB0EE408A94ED110A56 -:106F3000B4EEC80AF1EE10FA02DDB0EE480A01E044 -:106F400094ED110AB0EE408A94ED120AB4EEC80A2C -:106F5000F1EE10FA02D2B0EE480A01E094ED120A06 -:106F6000B0EE408A35E0D4ED0D0AB0EE600A394843 -:106F7000FFF70EFFB5EEC00AF1EE10FA07DDD4ED13 -:106F80000D0AB0EE600A3348FFF702FF01E0B0EEF1 -:106F9000480AB0EE408A94ED110AB4EEC80AF1EE48 -:106FA00010FA02DDB0EE480A01E094ED110AB0EEED -:106FB000408A94ED120AB4EEC80AF1EE10FA02D239 -:106FC000B0EE480A01E094ED120AB0EE408A00E00B -:106FD00000BF00BF84ED0F8A94ED0F0A1E48D0ED6C -:106FE000000AB7EE001A70EE810A20EE200A84ED46 -:106FF000210A94ED0F0AD0ED000AB7EE001A71EEE7 -:10700000600A20EE200A84ED220A94ED0F0AD4EDE6 -:10701000100AB4EEE00AF1EE10FA01DA012000E005 -:10702000002084F8580094ED0F0A84ED100A002027 -:1070300084F88C00D4ED100AB0EE600AD4F8900009 -:107040008047BDEC028B10BD0000C84200006144C7 -:10705000E814002084150020640100202DE9F04F81 -:107060009DB0054600240020199064216846F9F778 -:107070002FFA6878297840EA0129E878A97840EA67 -:107080000126012E01DA282E7EDCB9F1370F7DDCD6 -:1070900006EB0900382879DCF01DC11700EB5171AF -:1070A000C1F3C7011C9101222046611CCCB20DF82E -:1070B00000202046611CCCB20DF800202046621C46 -:1070C000D4B21C990DF800100027BB462DE000201B -:1070D0000DF8040082461AE009EB070188B21BA9EB -:1070E000F9F728FD1DF804009DF86C1001FA0AF16B -:1070F0000843C0B20DF80400781C87B2B74202DB27 -:107100000120199006E00AF1010000F0FF0ABAF12F -:10711000080FE1DB00BF601CC4B21998012800D140 -:1071200006E00BF1010000F0FF0B1C988345CEDB5D -:1071300000BF21466846FCF79DFC804608F0FF0230 -:107140002046611CCCB20DF800204FEA28222046D0 -:10715000611CCCB20DF800201248008AA04201DB6D -:10716000204601E00F48008A0E4948824A8AC868D2 -:107170006946F9F736F90B48428AC1680A4800F0B7 -:10718000FDFA1DB0BDE8F08F03E0FFE702201A9082 -:1071900001E003201A9001201A99FEF7E5FF00BFD5 -:1071A000EFE7000094130020140400202DE9F04FB5 -:1071B0009DB005460024002019906878297840EA9F -:1071C0000129E878A97840EA0126012E01DA312E5A -:1071D0007EDCB9F1300F7FDC06EB090031287BDC67 -:1071E000F01DC11700EB5171C1F3C7011C910122C1 -:1071F0002046611CCCB20DF8002002222046611C02 -:10720000CCB20DF800202046621CD4B21C990DF8B7 -:1072100000100027BB462DE000200DF80400824638 -:107220001AE009EB070188B21BA9F9F79FFC1DF8CA -:1072300004009DF86C1001FA0AF10843C0B20DF881 -:107240000400781C87B2B74202DB0120199006E0E7 -:107250000AF1010000F0FF0ABAF1080FE1DB00BFFC -:10726000601CC4B21998012800D106E00BF101009E -:1072700000F0FF0B1C988345CEDB00BF214668461B -:10728000FCF7F8FB804608F0FF022046611CCCB2F8 -:107290000DF800204FEA28222046611CCCB20DF8E0 -:1072A00000201348008AA04201DB204601E010487C -:1072B000008A0F4948824A8AC8686946F9F791F8F6 -:1072C0000B48428AC1680B4800F058FA1DB001E033 -:1072D00005E001E0BDE8F08F02201A9001E00320F4 -:1072E0001A9002201A99FEF73FFF00BFEEE7000058 -:1072F00094130020140400202DE9F04F99B00646A5 -:10730000002416B919B0BDE8F08F7078317840EAE2 -:107310000127F078B17840EA0125012D65DB312D98 -:1073200063DC302F5EDC781900285BDB78193128AC -:1073300058DC01222046611CCCB20DF8002003224B -:107340002046611CCCB20DF800206806020E2046D3 -:10735000611CCCB20DF800204FF0000817E007EBDD -:10736000080188B2F9F7D2FB81464FEA292220466C -:10737000611CCCB20DF8002009F0FF022046611C10 -:10738000CCB20DF8002008F101001FFA80F8A845E2 -:10739000E5DB21466846FCF76DFB82460AF0FF02FA -:1073A0002046611CCCB20DF800204FEA2A2220466C -:1073B000611CCCB20DF800201048008AA04201DB0D -:1073C000204601E00D48008A0C4948824A8AC86874 -:1073D0006946F9F706F80948428AC168084800F08A -:1073E000CDF98FE74FF0020B01E04FF0030B594648 -:1073F0000320FEF7B9FE00BF84E7000094130020CD -:10740000140400202DE9F04F99B00546002415B969 -:1074100019B0BDE8F08F6878297840EA0127E8784C -:10742000A97840EA0126012E62DB312E60DC302F84 -:107430005BDCB819312858DC01222046611CCCB233 -:107440000DF8002004222046611CCCB20DF800206B -:107450007006020E2046611CCCB20DF800204FF0E1 -:10746000000817E007EB080188B2F9F759FB8146DD -:107470004FEA29222046611CCCB20DF8002009F009 -:10748000FF022046611CCCB20DF8002008F101007B -:107490001FFA80F8B045E5DB21466846FCF7EAFABA -:1074A00082460AF0FF022046611CCCB20DF8002093 -:1074B0004FEA2A222046611CCCB20DF80020104869 -:1074C000008AA04201DB204601E00D48008A0C49F9 -:1074D00048824A8AC8686946F8F783FF0848428AA2 -:1074E000C168084800F04AF992E74FF0020B01E04A -:1074F0004FF0030B59460420FEF736FE00BF87E726 -:10750000941300201404002010B501221103144824 -:10751000FAF742F90122D1021148FAF73DF90122A6 -:10752000D1031048FAF738F900224FF480410D4892 -:10753000FAF732F9012280210A48FAF72DF90122DF -:1075400004210948FAF728F9012211460648FAF7FA -:1075500023F9002210210548FAF71EF910BD00009A -:10756000000C0240001002400004024000080240EB -:1075700068480068401C674908600846006804289D -:1075800005DD012064490860002062490860634805 -:107590000068401C6149086008460068092805DD4C -:1075A00001205F49086000205C4908605D48006870 -:1075B000401C5C49086008460068182805DD012069 -:1075C0005949086000205749086058480068401C25 -:1075D0005649086008460068312805DD01205449F5 -:1075E000086000205149086052480068401C514919 -:1075F000086008460068632805DD01204E490860E0 -:1076000000204C4908604D480068401C4B49086008 -:1076100008460068B0F5967F05DB01204849086000 -:1076200000204649086047480068401C45490860FA -:1076300008460068B0F5FA7F05DB01204249086082 -:1076400000204049086041480068401C3F490860EC -:1076500008460068B0F57A7F05DB01203C490860E8 -:1076600000203A4908603B480068B0F5FA7F05DB26 -:107670000120394908600020364908603548006813 -:10768000401C3449086035480068632805DD012046 -:107690003349086000203149086030480068401CC8 -:1076A0002E4908602F480068312805DD01202E4949 -:1076B000086000202B4908602A480068401C2949BE -:1076C00008602A4800681D2805DD01202849086057 -:1076D00000202649086025480068401C23490860AE -:1076E00024480068B0F5FA7F0EDB002021490860CD -:1076F00021480068B0F5E15F01DD002002E01E488E -:107700000068401C1C4908601A480068401C194960 -:1077100008607047F4000020F0000020FC0000200A -:10772000F800002004010020000100200C010020CE -:107730000801002014010020100100201C0100207D -:107740001801002024010020200100202C0100202D -:107750002801002034010020300100203C010020DD -:107760003801002044010020400100204C0100208D -:1077700048010020540100205001002070B504464B -:107780000D461646324629462046FBF733FE70BDAD -:1077900070B50446FDF7A4FE8020FCF7BFF9204633 -:1077A000FCF7BCF9FCF78CF90546FFF7ADFE28465F -:1077B00070BD70B505460C46FDF792FE0020FCF743 -:1077C000ADF92846FCF7AAF92046FCF7A7F9FFF720 -:1077D0009BFE70BD2DE9F04F9FB0044600250020B0 -:1077E0001B906078217840EA012AE078A17840EA8D -:1077F000012620791D90012E7EDB282E7CDC1D9831 -:10780000C000B0427FDBBAF1370F79DC0AEB06002B -:10781000382875DC0027A9462FE009F10500205C17 -:107820001C904FF0000B1CE0012000FA0BF01C999B -:10783000084018B14FF47F401E9001E000201E90D8 -:107840000AEB070188B21E99FCF7B2FD781C87B2DB -:10785000B74202DB01201B9006E00BF1010000F0B3 -:10786000FF0BBBF1080FDFDB00BF1B98012800D125 -:1078700006E009F1010000F0FF091D988145CCDB0D -:1078800000BF01222846691CCDB201A90A540F226B -:107890002846691CCDB201A90A5401A828442168D0 -:1078A0000160281DC5B2294601A8FCF7E3F880460F -:1078B0002846691CCDB201A901F800804FEA2822B0 -:1078C0002846691CCDB201A90A541348008AA8426F -:1078D00001DB284601E01048008A0F4948824A8AA5 -:1078E000C86801A9F8F77DFD0B48428AC1680B48BA -:1078F000FFF744FF1FB001E005E001E0BDE8F08FB5 -:1079000002201A9001E003201A900F201A99FEF726 -:107910002BFC00BFEEE700009413002014040020AD -:107920002DE9F04F9BB00446002614B91BB0BDE80A -:10793000F08F6078217840EA0128E078A17840EA69 -:10794000012794F804B0012F5FDB312F5DDCBBEB26 -:10795000470F5AD1B8F1300F54DC08EB070031283B -:1079600050DC002512E0062000EB4500205C0521DC -:1079700001EB4501615C40EA01201A9008EB05012A -:1079800088B21A99FCF70CFD681C85B2BD42EADB8F -:1079900001223046711CCEB201A90A541022304691 -:1079A000711CCEB201A90A5401A8304421680160BB -:1079B000301DC6B2314601A8FCF75CF8814630465E -:1079C000711CCEB201A901F800904FEA292230467D -:1079D000711CCEB201A90A541048008AB04201DBE2 -:1079E000304601E00D48008A0C4948824A8AC8683E -:1079F00001A9F8F7F6FC0948428AC1680848FFF770 -:107A0000BDFE93E74FF0020A01E04FF0030A0AF0CF -:107A1000FF011020FEF7A8FB00BF87E794130020AA -:107A2000140400202DE9F0479AB005468A46002448 -:107A30006878297840EA0129E878A97840EA01279E -:107A400017B1B7F57F4F43D1B9F1370F3DDC394658 -:107A50004846FCF7ADFC01222046611CCCB201A9CE -:107A60000A5405222046611CCCB201A90A5401A87F -:107A7000204429680160201DC4B2214601A8FBF7FB -:107A8000F9FF06462046611CCCB201A90E54321201 -:107A90002046611CCCB201A90A541148008AA042B8 -:107AA00001DB204601E00E48008A0D4948824A8ADF -:107AB000C86801A9F8F795FC0948428AC1680948D5 -:107AC000FFF75CFE1AB0BDE8F0874FF0020801E056 -:107AD0004FF0030841460520FEF746FB00BFF1E7E3 -:107AE00094130020140400202DE9F0479AB00546B5 -:107AF0008A46002415B91AB0BDE8F087687829785D -:107B000040EA0127E878A97840EA0128302F3BDCD9 -:107B100041463846FCF744FC01222046611CCCB2A9 -:107B200001A90A5406222046611CCCB201A90A54BC -:107B300001A8204429680160201DC4B2214601A883 -:107B4000FBF798FF06462046611CCCB201A90E54F3 -:107B500032122046611CCCB201A90A540E48008A98 -:107B6000A04201DB204601E00B48008A0A49488216 -:107B70004A8AC86801A9F8F734FC0748428AC168F4 -:107B80000648FFF7FBFDB6E74FF00209494606201D -:107B9000FEF7EAFA00BFAEE79413002014040020B9 -:107BA00010B591EA030F48BF83F0004300F1C4838E -:107BB000841A71EB030C05D2121943EB0C03001B62 -:107BC00061EB0C01DFF824E14FEA1154A4EB135CE4 -:107BD0001EEA430F18BF9EEA445F73D023EA0E03E8 -:107BE000DCF1200E21EA045143F4801332D322FA4F -:107BF0000CFE10EB0E0023FA0CFE41EB0E01CCF153 -:107C0000200E03FA0EFE10EB0E0051F10001B1F54B -:107C1000801FCCF1200E32D201EB045112FA0EF289 -:107C2000BDE8104058BF7047401C38BF5FEA4202B1 -:107C300018BF7047002814BF20F0010041F1000177 -:107C40004FEA410313F5001F38BF7047A1F1C0414F -:107C500000F064BB012A43EB0302ACF1200CDCF121 -:107C60001F0E32BF4FF0000E23FA0CF310EB03008F -:107C700041EB0451B4EB115FD0D0A1EB045101F5FD -:107C8000801149085FEA300001EB04510ED350F136 -:107C9000000038BF12FA0EFE08D1BDE81040C9E757 -:107CA000401C38BF5FEA4202CAD1C3E7BDE81040BA -:107CB0004FEA410313F5001F38BF7047A1F1C041DF -:107CC00000F02CBB9EEA445F08D011EA5E0FBDE8CD -:107CD000104004BF01F0004100207047BDE8104093 -:107CE00070B500F0CDFA00BF64FBBE3E0000E0FFBF -:107CF0002DE9C04130B4DFF8A0C23CEA111418BF2E -:107D00003CEA131400F0EC8081EA03051CEA11142C -:107D100044EAD57418BF1CEA131500F0C780A4EB21 -:107D200005044FF0004545EAC12145EAC32341EA75 -:107D3000505143EA525304F17F74994204F50034E0 -:107D40004FEAC0204FEAC22208BF904200F09C8058 -:107D50004FEA13650FF24016765D4FEA134506FBB6 -:107D600005F7C7F1807706FB07F74FEAD737A7FB80 -:107D700003687642C8F58038A7FB06CE38BFA8F165 -:107D8000010807FB08E64FF0000EA6FB028CE6FB9D -:107D900003CEDCF1000CCEF1004E38BFAEF1010E87 -:107DA000A6FB0C584FF000074FF00005E6FB0E87CE -:107DB000A1FB08C6A0FB07CE16EB0E0645F1000599 -:107DC000E1FB076515F1E04E7EBFA4F580345FEA64 -:107DD00046066D4116F1800745F100054FEA172769 -:107DE0004FEA066647EA0567A6F1DE46B6F1805F10 -:107DF0004FEA15251FD9384624F0010C05EBC47154 -:107E0000BCF1FE6F01EB0C1102D8F0BCBDE80081A3 -:107E100024425CBF01F5801E9EEAC47F02D4F0BC00 -:107E2000BDE80081244238D4F0BCA1F1C041BDE8D6 -:107E3000004100F073BA4FEAD22242EA43524FEABD -:107E4000D323A7FB02864FEAD02040EA415007FB2C -:107E500003661EEA0E0F4FEAD12105FB026658BFEA -:107E6000A6EB0056B6EB00564FEA520E4EEAC37E22 -:107E700018EB0E0E56EB530EBDD518EB02085E4103 -:107E80007F1C55F10005B6E74FF480154FF0000751 -:107E90004FF000064FF00008ADE7F0BC4FF00000D7 -:107EA00001F1C04101F00041BDE8008111EA0C1F61 -:107EB0000CEA131500D00CE013EA0C1F00F025802B -:107EC0004FF00000F0BC81EA030101F00041BDE881 -:107ED0000081F0BCBDE8004181EA030100F01EBA58 -:107EE000F0BCBDE8004170B500F0CAF9097EFC3E67 -:107EF00000F007B881EA03014FF0000001F00041F3 -:107F0000704781EA030100F009BAF0BCBDE8004106 -:107F10004FF0000021497047FFFDFBF9F7F5F4F23F -:107F2000F0EEEDEBE9E8E6E4E3E1E0DEDDDBDAD814 -:107F3000D7D5D4D3D1D0CFCDCCCBCAC8C7C6C5C472 -:107F4000C2C1C0BFBEBDBCBBBAB9B8B7B6B5B4B389 -:107F5000B2B1B0AFAEADACABAAA9A8A8A7A6A5A474 -:107F6000A3A3A2A1A09F9F9E9D9C9C9B9A99999838 -:107F70009797969595949393929191908F8F8E8EDB -:107F80008D8C8C8B8B8A8989888887878685858468 -:107F900084838382828181800000FF070000F87F54 -:107FA0004FEA41034FEA5353A3F58063D3F11E0315 -:107FB000C8BFD3F1210C0CDD4FF0004242EAC122D0 -:107FC00042EA505232FA03FC8CEAE17CACEBE170FD -:107FD0007047102BC4BF0020704703F5787CBCF1BC -:107FE000FF3F04D06FF0004282EA2100704770B575 -:107FF00000F046F94992248000207047F2E7000023 -:108000004FEA1153A3F58063D3F11E03A8BFD3F148 -:10801000200C08DB4FF0004242EAC12252EA5052E3 -:1080200032FA03F0704709420BD4102BC4BF002072 -:10803000704703F5787CBCF1FF3F05D04FF0FF306F -:1080400070474FF00000704770B500F019F900BF9D -:108050004992248000207047F0E710F0004248BFAA -:108060004042B0FA80F310FA03F10AD0C3F11D03C5 -:1080700003F580634FEA415002EB035202EBD1213A -:1080800070474FF0000070477FEAE17202D1101A8A -:1080900062EB0101B1FA81F30B3B24D3994012D179 -:1080A000B0FA80F310FA03F108BF7047C3F11D0363 -:1080B00003F5406303EBC2234FEAD1224FEA41505C -:1080C00002EB03517047C3F1200C20FA0CFC9840DE -:1080D000C3F1320303F5406303EBC22341EA0C0111 -:1080E00001EB0351704710B5C3F1320CC3F100042A -:1080F000C4F1200E0CF5406C0CEBC22201FA0EFC10 -:1081000021FA04F100FA0EF3E040BDE8104040EA25 -:108110000C0001EB025138BF7047401C41F10001D7 -:108120005B0008BF20F0010070470000DFF848C185 -:1081300070B51CEA111E1EBF1CEA13159EEA0C0F37 -:1081400095EA0C0F00F06F8081EA030423EA4C13D8 -:108150004EEAD47E21EA4C1141F4801143F480139D -:10816000AE44A1FB024CA0FB0365AEF17F7E361945 -:1081700055EB0C05A1FB034C4CF10003A0FB021CCA -:1081800016EB0C06654153F10003094218BF46F097 -:10819000010613F4007F0BD14FEA03314FEA05309B -:1081A000340341EA155140EA16506FF003020AE029 -:1081B0004FEAC3214FEAC520F40241EA555140EA93 -:1081C00056506FF0020202EB2E4201EB025585EA97 -:1081D000CE710AD05FEA440C18BF24F0004450F17D -:1081E000000041F1000120EAD47040F2FE7C6245BB -:1081F00000D270BDA84214BF4FF080444FF04044FD -:10820000002E08BF0024BEF1806FA8BFA1F1C041BD -:10821000BDE8704080F282804FF0000001F1C04163 -:1082200001F0004170479EEA0C0F0CEA131518BFCD -:1082300095EA0C0F06D04FF0000081EA030E0EF015 -:10824000004170BD00F01CF88900013E00F007B845 -:1082500000F009B84FEA430C5FEA5C5C08D081EAA1 -:10826000030100F05BB84FEA410C5FEA5C5CF6D1B9 -:108270004FF00000014970470000FF070000F87F41 -:108280000EF1020E2EF0030E5EF8046B364205D49A -:10829000012A43EB030515F5001F12D8012841EB15 -:1082A000010C1CF5001F0CD80ED14FEAD17C15F53E -:1082B000001F0CEB4C0C0CF1020C08BF4CEBD37CF8 -:1082C00004E04FF0080C01E04FEAD37C0CEB4C05C6 -:1082D00026FA05F606F00706B6F1040C06D20EEBF8 -:1082E000860CBDE870404CF0010C6047DFE80CF0F4 -:1082F000090B02024FF000414FF00000A1F50021F0 -:1083000070BD19461046012851EB010418BFD4F581 -:10831000001484BF002001F0004170BD0808A0F5E2 -:1083200000114FEA3101704710B591EA030F48BFC1 -:1083300083F000433FF53CAC841A71EB030C07D289 -:1083400012198CF0004C43EB0C03001B61EB0C0189 -:10835000DFF8A4E14FEA1154A4EB135C1EEA430FCB -:1083600018BF9EEA445F00F0B08023EA6E035242D9 -:1083700021EA0451C3EB6E0338BF5B1EDCF1200E13 -:1083800025D322FA0CFE10EB0E0043FA0CFE41EB53 -:108390000E01CCF1200E03FA0EFE10EB0E0051F18F -:1083A0000001CCF1200E29D412FA0EF201EB045197 -:1083B000BDE8104058BF7047401C1CBFB2F1004FD1 -:1083C000704700280CBF491C20F00100704712EBD9 -:1083D000020E43EB030218BF4FF0010E4EEA4202B9 -:1083E000ACF1200CDCF11E0E54D943FA0CFE10EB5C -:1083F0000E0051F1FF31CCF11E0ED5D50EF1010E5C -:1084000012FA0EFE404141EB010101EB445C5FEAD0 -:108410005C5C10D910EBDE7001EB045138BFBEF18B -:10842000004FBDE8104018BF704700280CBF491C22 -:1084300020F00100704730D24FEAD42C11F5001122 -:1084400024F400641BD0B1FA81F20B3AA41AA41EE2 -:10845000D2F12003914030FA03F31943904001EB2D -:10846000CC71002C01EB0451BDE81040A8BF70474F -:1084700001F1C0414FF0000001F000417047B0FA37 -:1084800080F310FA03F100D110BDE41A173C48053F -:10849000C90AE4E701EB045110BD491001EB045196 -:1084A000BDE810404FEA300002E04FF00001704795 -:1084B0004A0008BF0042F8D0B2F5001F28BF70473D -:1084C00001F000414FF0000070479EEA445F07D082 -:1084D00011EA5E0FBDE8104004BF00210020704784 -:1084E000BDE8104070B5FFF7CBFE00BF40DFF63EA1 -:1084F00083F00041104670470000E0FF4FF04070ED -:10850000E1EE100A70470006101600061016000073 -:108510000000000000000102030406070809000033 -:10852000000001020304000048850008000000204C -:10853000A0010000C401000868850008A001002017 -:10854000E01A0000200200084132104201034D24CD -:10855000F43954012B02D7640518CDCC4C3D2305CA -:08856000045AFF0101103298DA +:105E1000B3FB00F0EBF8FFF717FDFEF705FB00F012 +:105E200001FAFFF7CBFD00F01BFE07E0FFF700FCD7 +:105E3000FFF70EFAFFF782F8FFF76AFEF6E70000B9 +:105E40003C03002010B52DED028B9FED5C0AB0EEF7 +:105E5000408AFAF7A7FE04462078594908600846A8 +:105E600000680002086060780968084354490860C7 +:105E70000846006800020860A07809680843504995 +:105E8000086008460068B0F5000F0FDB08460068A0 +:105E9000A0F1807000EE100AB8EEC00ADFED490AEA +:105EA00080EE201A484880ED001A0BE0444890ED3F +:105EB000000AB8EEC00ADFED430A80EE201A42481D +:105EC00080ED001A4048D0ED000A9FED400A9FED9A +:105ED000401A01EE200AF2EE080A80EE201A3D4830 +:105EE00080ED001A90ED000AF2EE040A20EE200A7E +:105EF00039480078401E00EB8000384901EB001063 +:105F00003749097800EB810080ED000A32480078BB +:105F1000401C314908700846007803282FDD012213 +:105F200051023048FBF738FC002026E09FED230AA1 +:105F3000B0EE408A00210EE000EB8002274B03EB1D +:105F4000021202EB810292ED000A30EE080AB0EE76 +:105F5000408A4A1CD1B21429EEDBB3EE040AC8EE23 +:105F6000000ABCEEE00A10EE101A8AB200F10D0130 +:105F70001D4B23F81120411CC8B20628D6DB164859 +:105F8000007806280DDD01201349087014480078B8 +:105F9000401C1349087008460078132801DD0020D2 +:105FA00008700D480078042805DA00224FF40071CB +:105FB0000C48FBF7F1FBBDEC028B10BD00000000AC +:105FC000680000200000004B7400002000A00C4678 +:105FD00000401C466C0000205C000020F007002000 +:105FE0007800002000080240D009002010B501F020 +:105FF00043FA00224FF400712A48FBF7CDFB0A2038 +:10600000FFF7DAFA0120284908708121002001F009 +:1060100088FB0A20FFF7D0FA02202349087081216B +:10602000002001F07EFB0A20FFF7C6FA03201E497C +:1060300008708121002001F074FB0A20FFF7BCFAF0 +:10604000012251021748FBF7A7FB0A20FFF7B4FA19 +:106050000420154908708121002001F062FB0A200C +:10606000FFF7AAFA0520104908708121002001F0ED +:1060700058FB0A20FFF7A0FA06200B49087081217F +:10608000002001F04EFB0A20FFF796FA0120064996 +:106090000870002241020348FBF77EFB0A20FFF74D +:1060A0008BFA10BD000802405C0000202DE9F04191 +:1060B00004460D460CB1022D01DABDE8F0812678C8 +:1060C0006778012E01D0002E48D1052F3AD008DC88 +:1060D000012F0DD0022F11D0032F15D0042F37D14F +:1060E00018E0062F1CD00F2F20D0102F30D123E026 +:1060F000A81E81B2A01C00F069FF2EE0A81E81B28C +:10610000A01C01F00BF828E0A81E81B2A01C01F031 +:10611000ABF822E0A81E81B2A01C01F02BF91CE014 +:10612000A81E81B2A01C01F097FC16E0A81E81B247 +:10613000A01C01F007FB10E0A81E81B2A01C01F01A +:10614000A7FB0AE0A81E81B2A01C01F023FC04E01A +:106150006078012100F004F800BF00BF00BFACE789 +:10616000F0B599B005460E460024002701222146CD +:10617000641C0DF8012045F080022146641C0DF8D6 +:1061800001202146641C0DF8016021466846FDF798 +:1061900071FC0746FAB22146641C0DF801203A1240 +:1061A0002146641C0DF801200B48008AA04201DB47 +:1061B000204601E00848008A074948824A8AC868A0 +:1061C0006946FAF70EF90448428AC168034801F0AB +:1061D0008DFA19B0F0BD00009413002014040020C3 +:1061E0002DE9F04100240E480568C488022C01DA2C +:1061F000BDE8F081A01E295C601E285C41EA0027F2 +:10620000A01E81B22846FDF735FC0646B74200D0F5 +:10621000EEE7034AD1881068FFF748FF00BFE7E7C1 +:106220009413002010B50E480E49086000208880A5 +:10623000C88008720C48C8604FF480600882002053 +:106240004882012209490A48FDF752F86FF001001F +:106250000849096808610748FCF7D6F910BD000035 +:10626000940A002094130020940E00205C0100206A +:10627000140400208403002010B51848808840F2E0 +:10628000FF3188420EDB00201449888008460068F0 +:10629000002101604FF6FF730A2211A11448FDF797 +:1062A00049F814E0134801780C4882888088401C23 +:1062B0000A4B98801846006881540F48FCF7F8F99B +:1062C00000200D49096848620B48FCF79DF901223E +:1062D00008490748FDF70CF810BD00009413002092 +:1062E000E695B0E68DAEE6BAA2E587BA00000000FA +:1062F000140400205C0100208403002000210170B0 +:1063000000BF11E09FED110A00F1080202EB8102CB +:1063100082ED000A9FED0D0A00F1200202EB8102DE +:1063200082ED000A4A1CD1B20529EBDB9FED080A79 +:1063300080ED010A9FED050A80ED0E0A9FED030A2C +:1063400080ED0F0A002180F8401070470000000027 +:106350009A99193E70B505460C4694480078052870 +:106360007ED2DFE800F003347ECEF3009048006870 +:10637000401C40B98F4800688D4908602846B1EE3E +:10638000000A00F02DFD8B4800688B490860084624 +:10639000006887490968401A14280BDD4FF0FF3068 +:1063A000834908608449086080480078401C7F4920 +:1063B00008700BE0804800687D490968401A05D5DF +:1063C0004FF0FF307A4908607B490860ECE07B4879 +:1063D000808C00EE100AB8EE400A7948D0ED000A31 +:1063E00030EE600AF2EE040A80EE201A84ED0E1AF6 +:1063F00094ED0E0A9FED731AC0EE010A95ED110A95 +:1064000095ED121A30EE411A95ED120A00EE810A4E +:1064100084ED1A0A00201BE094ED1A0AD5ED120A49 +:1064200070EE600A00EE100AB8EE400A20EE800A14 +:10643000F2EE020A80EE201A95ED120A31EE000A01 +:1064400004F1440101EB800181ED000A411CC8B256 +:106450000928E1DB55480078401C54490870A3E046 +:10646000A1E053480068401C80B952480068504978 +:10647000086004F144005449097800EB8100D0ED34 +:10648000000AB0EE600A284600F0AAFC49480068FD +:10649000494908600846006845490968401A94F867 +:1064A0009810884220DD95ED0B0A04F16C004649F6 +:1064B000097800EB810080ED000A4FF0FF303C4985 +:1064C00008603D49086040480078401C3E4908701B +:1064D000084600780A2813DB00200870334800784B +:1064E000401C324908700BE03348006830490968A5 +:1064F000401A05D54FF0FF302D4908602E4908603D +:1065000052E02B480068401C18B92A480068284906 +:10651000086028480068284908600846006824493F +:106520000968401A0A2830DD6878012802D002285C +:1065300019D10CE09FED250A254880ED000A254879 +:10654000C07800F0BF002349C8700DE02AE09FED3D +:106550001F0A214880ED000A1E48C07800F0DF00C5 +:106560001C49C87000E000BF00BF4FF0FF30104969 +:1065700008601149086000202070022028700B4834 +:106580000078401C094908700BE00B480068084976 +:106590000968401A05D54FF0FF30054908600649E3 +:1065A000086001E000E000BF00BF70BD8101002075 +:1065B000840100205001002088010020D009002023 +:1065C0007C010020000061448D01002000000000DB +:1065D000740100207A000020780100200021017061 +:1065E000B2EE020A80ED250A0A2180F898100021F7 +:1065F00011E09FED0A0A00F1440202EB810282EDF4 +:10660000000A9FED060A00F16C0202EB810282EDA6 +:10661000000A4A1CD1B20A29EBDB704700000000D7 +:1066200010B50446D4ED130AB0EE600AFDF76EFF14 +:10663000D4ED150AB4EEE00AF1EE10FA7EDDD4EDE9 +:10664000130AB0EE600AFDF761FFF2EE040AB4EE41 +:10665000E00AF1EE10FA71D2D4ED130A60EEA00A4E +:10666000B0EE600AFDF752FFF2EE040A30EE200AA7 +:10667000F2EE040A80EE201AD54880ED001AD4ED1F +:10668000130AB0EE600AFDF741FFF1EE040A30EEA6 +:10669000200AF2EE040A80EE201ACE4880ED001A9D +:1066A00094F8580010B101287ED16BE094ED1A0ADD +:1066B000D4ED130AC64890ED001A00EE810A84ED6D +:1066C0001A0A94ED1A0AD4ED1B0AB4EEE00AF1EEB0 +:1066D00010FA02DD94ED1B0A01E094ED1A0A84ED34 +:1066E0001A0A94ED1A0AD4ED1C0AB4EEE00AF1EE8F +:1066F00010FA02D294ED1C0A01E094ED1A0A84ED1E +:106700001A0AD4ED1E0A94ED181A80EE810AD4ED0F +:106710001A0A20EE200A84ED190AD4ED1D0A94ED20 +:106720001E1A80EE810AD4ED130A94ED141A70EE4D +:10673000C10A20EE200A84ED1F0A00E0F9E094ED82 +:10674000130AD4ED190A30EE200AD4ED1F0A30EEF8 +:10675000200AD4ED170A20EE200A84ED200A94EDD9 +:10676000200A9FED9D1AC0EE010A94ED110A94EDE6 +:10677000121A30EE411A94ED120A00EE810A84EDED +:10678000100A6CE094ED1A0AD4ED130A914890EDCA +:10679000001A00EE810A84ED1A0A94ED1A0AD4ED6B +:1067A0001B0AB4EEE00A00E058E0F1EE10FA02DD58 +:1067B00094ED1B0A01E094ED1A0A84ED1A0A94ED97 +:1067C0001A0AD4ED1C0AB4EEE00AF1EE10FA02D275 +:1067D00094ED1C0A01E094ED1A0A84ED1A0AD4ED36 +:1067E0001E0A94ED181A80EE810AD4ED1A0A20EEE2 +:1067F000200A84ED190AD4ED1D0A94ED1E1A80EECC +:10680000810AD4ED130A94ED141A70EEC10A20EE39 +:10681000200A84ED1F0A94ED130AD4ED190A30EE14 +:10682000200AD4ED1F0A30EE200AD4ED170A20EE1C +:10683000200A84ED200A94ED200A9FED671AC0EE2D +:10684000010A94ED110A94ED121A30EE411A94EDFA +:10685000120A00EE810A84ED100A00E000BF00BFBA +:1068600094ED100AD4ED210AB4EEE00AF1EE10FA2C +:1068700002D294ED100A01E094ED210A84ED100A91 +:1068800094ED100AD4ED220AB4EEE00AF1EE10FA0B +:1068900002DD94ED100A01E094ED220A84ED100A65 +:1068A00094ED130A84ED140AD4ED010A94ED0A1A4A +:1068B00070EEC10AB0EE600AFDF728FEF2EE040A9F +:1068C000B4EEE00AF1EE10FA02D8012084F88C0050 +:1068D00094ED0F0AD4ED110A9FED401A60EE810A83 +:1068E000B4EEE00AF1EE10FA02D294ED100A01E0E3 +:1068F00094ED110A84ED100A94ED0F0AD4ED120AFA +:106900009FED371A60EE810AB4EEE00AF1EE10FA5C +:1069100007D894ED120A84ED100A9FED320A84ED37 +:106920001A0AD4ED100AB0EE600AD4F8900080473D +:106930004DE0D4ED130AB0EE600AFDF7E7FDF2EE8C +:10694000040AB4EEE00AF1EE10FA40DB94F85800C5 +:1069500010B1012839D127E094ED0E0A2248D0ED7C +:10696000000A9FED1D1A01EE600A94ED171AC0EEA1 +:10697000010A94ED1E0AD4ED181A80EE211A80EE59 +:10698000810A84ED1A0A94ED1A0AD4ED1C0AB4EEB9 +:10699000E00AF1EE10FA02D294ED1C0A01E094ED47 +:1069A0001A0A84ED1A0A11E094ED0E0A94ED171AF2 +:1069B000C0EE010A94ED1E1AD4ED181A81EE210AD8 +:1069C00080EE801A84ED1A1A00E000BF00BF10BDEF +:1069D000680100206C0100200000C84252B87E3FD0 +:1069E000D7A3803F000000006401002070B5054679 +:1069F0000C46287820B101280FD0022828D11DE0AC +:106A00002078012805D12046FFF778FC052012499F +:106A100008702846FFF704FE1BE0104800780428A1 +:106A200007D12046FFF7DAFD0120207000200B4936 +:106A3000087021462846FFF78DFC0AE020780128DF +:106A400005D12046FFF75AFC05200349087000E0F5 +:106A500070BD00BF00BFFBE7800100208101002066 +:106A600010B503229D490020FFF712F802209C492F +:106A7000087001204870002009E09FED9A0A9849AB +:106A8000091D01EB800181ED000A411CC8B20A28F2 +:106A9000F3DB9FED940A924880ED0B0A9FED910A7B +:106AA00080ED0C0A9FED8F0A80ED0D0A9FED8D0A97 +:106AB00080ED0E0A9FED8B0A80ED0F0A9FED890A8B +:106AC00080ED100AB1EE000A80ED120AB3EE040A5E +:106AD00080ED110A9FED830A80ED130A9FED810A74 +:106AE00080ED140AB6EE000A80ED150A7B4890EDA1 +:106AF000000A10EE101A0846FDF7E2FC10B19FEDF7 +:106B0000790A02E0754890ED000A754880ED170A91 +:106B1000724890ED010AB5EEC00AF1EE10FA02D10A +:106B20009FED710A02E06D4890ED010A6C4880ED1E +:106B3000180A9FED6C0A80ED190A9FED6C0A80ED32 +:106B40001B0A9FED680A80ED1C0A9FED660A80ED26 +:106B50001A0A624890ED020A614880ED1D0A9FED15 +:106B6000640A80ED1E0A9FED5F0A80ED1F0A9FED0B +:106B70005D0A80ED200A9FED5B0A80ED210A9FED02 +:106B8000590A80ED220A0020554981F88C005948A5 +:106B9000C1F890009FED530AD1F89000804703227E +:106BA0004E490C20FEF774FF0220534908704870CC +:106BB000002009E09FED4B0A4F49091D01EB8001C0 +:106BC00081ED000A411CC8B20A28F3DB9FED450A9B +:106BD000494880ED0B0A9FED430A80ED0C0A9FEDBA +:106BE000410A80ED0D0A9FED3F0A80ED0E0A9FEDF0 +:106BF0003D0A80ED0F0A9FED3B0A80ED100AB1EED1 +:106C0000000A80ED120AB3EE040A80ED110A9FED2E +:106C1000350A80ED130A9FED330A80ED140AB6EEB3 +:106C2000000A80ED150A2D4890ED000A10EE101AAA +:106C30000846FDF745FC10B19FED2A0A02E02748FF +:106C400090ED000A2C4880ED170A244890ED010AC7 +:106C5000B5EEC00AF1EE10FA02D19FED230A02E070 +:106C60001E4890ED010A244880ED180A9FED1D0A88 +:106C700080ED190A9FED1D0A80ED1B0A9FED190A90 +:106C800080ED1C0A9FED170A80ED1A0A134890ED5B +:106C9000020A194880ED1D0A9FED150A80ED1E0AB3 +:106CA0009FED100A80ED1F0A9FED0E0A80ED200A6D +:106CB0009FED0C0A80ED210A9FED0A0A80ED220A61 +:106CC00000200D4981F88C000C48C1F890009FED20 +:106CD000050AD1F89000804710BD0000DC140020A8 +:106CE000A8130020000000000024744900409C45C7 +:106CF000CDCC4C3DA15200083C140020ED520008C0 +:106D0000F0EE400A9FED350AB0EE401A90ED240AED +:106D1000B5EEC00AF1EE10FA02D1BFEE000A7047DC +:106D2000002155E000F16C0202EB810292ED000AB5 +:106D3000B4EEE00AF1EE10FA3DD800F16C024B1C03 +:106D400002EB830292ED000AB4EEE00AF1EE10FAD3 +:106D500031DD00F1440202EB830292ED000A00F102 +:106D6000440202EB8102D2ED001A30EE610A00F11A +:106D70006C0202EB8102D2ED001A70EEE11A20EEF5 +:106D8000210A00F16C0202EB8302D2ED001A00F13D +:106D90006C0202EB810292ED002A31EEC22AC0EEB3 +:106DA000021A00F1440202EB810292ED000A31EE78 +:106DB000800AB0EE401A90ED240AB4EEE00AF1EE3B +:106DC00010FA03D890ED1A0AB0EE401A4A1CD1B25C +:106DD0000929A7DBB0EE410AA1E70000000000008E +:106DE00010B52DED028BB0EE408A044694ED110AE9 +:106DF000B4EEC80AF1EE10FA02DDB0EE480A01E086 +:106E000094ED110AB0EE408A94ED120AB4EEC80A6D +:106E1000F1EE10FA02D2B0EE480A01E094ED120A47 +:106E2000B0EE408A94ED110AD4ED120A30EE600AF9 +:106E3000D4ED120A38EE601AC1EE000A9FED5E0A28 +:106E400020EE800A84ED0E0A94ED0E0A9FED5A1A88 +:106E5000C0EE010A9FED590A20EE800A84ED0D0A6A +:106E60006078012802D002286AD134E0D4ED0D0AFE +:106E7000B0EE600A5248FFF743FFB5EEC00AF1EEEC +:106E800010FA07DDD4ED0D0AB0EE600A4C48FFF7AA +:106E900037FF01E0B0EE480AB0EE408A94ED110AE7 +:106EA000B4EEC80AF1EE10FA02DDB0EE480A01E0D5 +:106EB00094ED110AB0EE408A94ED120AB4EEC80ABD +:106EC000F1EE10FA02D2B0EE480A01E094ED120A97 +:106ED000B0EE408A35E0D4ED0D0AB0EE600A3948D4 +:106EE000FFF70EFFB5EEC00AF1EE10FA07DDD4EDA4 +:106EF0000D0AB0EE600A3348FFF702FF01E0B0EE82 +:106F0000480AB0EE408A94ED110AB4EEC80AF1EED8 +:106F100010FA02DDB0EE480A01E094ED110AB0EE7D +:106F2000408A94ED120AB4EEC80AF1EE10FA02D2C9 +:106F3000B0EE480A01E094ED120AB0EE408A00E09B +:106F400000BF00BF84ED0F8A94ED0F0A1E48D0EDFC +:106F5000000AB7EE001A70EE810A20EE200A84EDD6 +:106F6000210A94ED0F0AD0ED000AB7EE001A71EE77 +:106F7000600A20EE200A84ED220A94ED0F0AD4ED77 +:106F8000100AB4EEE00AF1EE10FA01DA012000E096 +:106F9000002084F8580094ED0F0A84ED100A0020B8 +:106FA00084F88C00D4ED100AB0EE600AD4F890009A +:106FB0008047BDEC028B10BD0000C8420000614458 +:106FC000E814002084150020640100202DE9F04F12 +:106FD0009DB0054600240020199064216846F9F709 +:106FE00077FA6878297840EA0129E878A97840EAB0 +:106FF0000126012E01DA282E7EDCB9F1370F7DDC67 +:1070000006EB0900382879DCF01DC11700EB51713F +:10701000C1F3C7011C9101222046611CCCB20DF8BE +:1070200000202046611CCCB20DF800202046621CD6 +:10703000D4B21C990DF800100027BB462DE00020AB +:107040000DF8040082461AE009EB070188B21BA97B +:10705000F9F770FD1DF804009DF86C1001FA0AF1B3 +:107060000843C0B20DF80400781C87B2B74202DBB7 +:107070000120199006E00AF1010000F0FF0ABAF1C0 +:10708000080FE1DB00BF601CC4B21998012800D1D1 +:1070900006E00BF1010000F0FF0B1C988345CEDBEE +:1070A00000BF21466846FCF7E5FC804608F0FF0279 +:1070B0002046611CCCB20DF800204FEA2822204661 +:1070C000611CCCB20DF800201248008AA04201DBFE +:1070D000204601E00F48008A0E4948824A8AC86863 +:1070E0006946F9F77EF90B48428AC1680A4800F000 +:1070F000FDFA1DB0BDE8F08F03E0FFE702201A9013 +:1071000001E003201A9001201A99FFF729F800BF27 +:10711000EFE7000094130020140400202DE9F04F45 +:107120009DB005460024002019906878297840EA2F +:107130000129E878A97840EA0126012E01DA312EEA +:107140007EDCB9F1300F7FDC06EB090031287BDCF7 +:10715000F01DC11700EB5171C1F3C7011C91012251 +:107160002046611CCCB20DF8002002222046611C92 +:10717000CCB20DF800202046621CD4B21C990DF848 +:1071800000100027BB462DE000200DF804008246C9 +:107190001AE009EB070188B21BA9F9F7E7FC1DF813 +:1071A00004009DF86C1001FA0AF10843C0B20DF812 +:1071B0000400781C87B2B74202DB0120199006E078 +:1071C0000AF1010000F0FF0ABAF1080FE1DB00BF8D +:1071D000601CC4B21998012800D106E00BF101002F +:1071E00000F0FF0B1C988345CEDB00BF21466846AC +:1071F000FCF740FC804608F0FF022046611CCCB240 +:107200000DF800204FEA28222046611CCCB20DF870 +:1072100000201348008AA04201DB204601E010480C +:10722000008A0F4948824A8AC8686946F9F7D9F83E +:107230000B48428AC1680B4800F058FA1DB001E0C3 +:1072400005E001E0BDE8F08F02201A9001E0032084 +:107250001A9002201A99FEF783FF00BFEEE70000A4 +:1072600094130020140400202DE9F04F99B0064635 +:10727000002416B919B0BDE8F08F7078317840EA73 +:107280000127F078B17840EA0125012D65DB312D29 +:1072900063DC302F5EDC781900285BDB781931283D +:1072A00058DC01222046611CCCB20DF800200322DC +:1072B0002046611CCCB20DF800206806020E204664 +:1072C000611CCCB20DF800204FF0000817E007EB6E +:1072D000080188B2F9F71AFC81464FEA29222046B4 +:1072E000611CCCB20DF8002009F0FF022046611CA1 +:1072F000CCB20DF8002008F101001FFA80F8A84573 +:10730000E5DB21466846FCF7B5FB82460AF0FF0242 +:107310002046611CCCB20DF800204FEA2A222046FC +:10732000611CCCB20DF800201048008AA04201DB9D +:10733000204601E00D48008A0C4948824A8AC86804 +:107340006946F9F74EF80948428AC168084800F0D2 +:10735000CDF98FE74FF0020B01E04FF0030B5946D8 +:107360000320FEF7FDFE00BF84E700009413002019 +:10737000140400202DE9F04F99B00546002415B9FA +:1073800019B0BDE8F08F6878297840EA0127E878DD +:10739000A97840EA0126012E62DB312E60DC302F15 +:1073A0005BDCB819312858DC01222046611CCCB2C4 +:1073B0000DF8002004222046611CCCB20DF80020FC +:1073C0007006020E2046611CCCB20DF800204FF072 +:1073D000000817E007EB080188B2F9F7A1FB814626 +:1073E0004FEA29222046611CCCB20DF8002009F09A +:1073F000FF022046611CCCB20DF8002008F101000C +:107400001FFA80F8B045E5DB21466846FCF732FB01 +:1074100082460AF0FF022046611CCCB20DF8002023 +:107420004FEA2A222046611CCCB20DF800201048F9 +:10743000008AA04201DB204601E00D48008A0C4989 +:1074400048824A8AC8686946F8F7CBFF0848428AEA +:10745000C168084800F04AF992E74FF0020B01E0DA +:107460004FF0030B59460420FEF77AFE00BF87E772 +:10747000941300201404002010B5012211031448B5 +:10748000FAF78AF90122D1021148FAF785F90122A7 +:10749000D1031048FAF780F900224FF480410D48DB +:1074A000FAF77AF9012280210A48FAF775F90122E0 +:1074B00004210948FAF770F9012211460648FAF743 +:1074C0006BF9002210210548FAF766F910BD00009B +:1074D000000C02400010024000040240000802407C +:1074E00068480068401C674908600846006804282E +:1074F00005DD012064490860002062490860634896 +:107500000068401C6149086008460068092805DDDC +:1075100001205F49086000205C4908605D48006800 +:10752000401C5C49086008460068182805DD0120F9 +:107530005949086000205749086058480068401CB5 +:107540005649086008460068312805DD0120544985 +:10755000086000205149086052480068401C5149A9 +:10756000086008460068632805DD01204E49086070 +:1075700000204C4908604D480068401C4B49086099 +:1075800008460068B0F5967F05DB01204849086091 +:1075900000204649086047480068401C454908608B +:1075A00008460068B0F5FA7F05DB01204249086013 +:1075B00000204049086041480068401C3F4908607D +:1075C00008460068B0F57A7F05DB01203C49086079 +:1075D00000203A4908603B480068B0F5FA7F05DBB7 +:1075E00001203949086000203649086035480068A4 +:1075F000401C3449086035480068632805DD0120D7 +:107600003349086000203149086030480068401C58 +:107610002E4908602F480068312805DD01202E49D9 +:10762000086000202B4908602A480068401C29494E +:1076300008602A4800681D2805DD012028490860E7 +:1076400000202649086025480068401C234908603E +:1076500024480068B0F5FA7F0EDB0020214908605D +:1076600021480068B0F5E15F01DD002002E01E481E +:107670000068401C1C4908601A480068401C1949F1 +:1076800008607047F4000020F0000020FC0000209B +:10769000F800002004010020000100200C0100205F +:1076A0000801002014010020100100201C0100200E +:1076B0001801002024010020200100202C010020BE +:1076C0002801002034010020300100203C0100206E +:1076D0003801002044010020400100204C0100201E +:1076E00048010020540100205001002070B50446DC +:1076F0000D461646324629462046FBF77BFE70BDF6 +:1077000070B50446FDF7ECFE8020FCF707FA204632 +:10771000FCF704FAFCF7D4F90546FFF7ADFE28465E +:1077200070BD70B505460C46FDF7DAFE0020FCF78B +:10773000F5F92846FCF7F2F92046FCF7EFF9FFF7D8 +:107740009BFE70BD2DE9F04F9FB004460025002040 +:107750001B906078217840EA012AE078A17840EA1D +:10776000012620791D90012E7EDB282E7CDC1D98C1 +:10777000C000B0427FDBBAF1370F79DC0AEB0600BC +:10778000382875DC0027A9462FE009F10500205CA8 +:107790001C904FF0000B1CE0012000FA0BF01C992C +:1077A000084018B14FF47F401E9001E000201E9069 +:1077B0000AEB070188B21E99FCF7FAFD781C87B224 +:1077C000B74202DB01201B9006E00BF1010000F044 +:1077D000FF0BBBF1080FDFDB00BF1B98012800D1B6 +:1077E00006E009F1010000F0FF091D988145CCDB9E +:1077F00000BF01222846691CCDB201A90A540F22FC +:107800002846691CCDB201A90A5401A82844216860 +:107810000160281DC5B2294601A8FCF72BF9804656 +:107820002846691CCDB201A901F800804FEA282240 +:107830002846691CCDB201A90A541348008AA842FF +:1078400001DB284601E01048008A0F4948824A8A35 +:10785000C86801A9F8F7C5FD0B48428AC1680B4802 +:10786000FFF744FF1FB001E005E001E0BDE8F08F45 +:1078700002201A9001E003201A900F201A99FEF7B7 +:107880006FFC00BFEEE700009413002014040020FA +:107890002DE9F04F9BB00446002614B91BB0BDE89B +:1078A000F08F6078217840EA0128E078A17840EAFA +:1078B000012794F804B0012F5FDB312F5DDCBBEBB7 +:1078C000470F5AD1B8F1300F54DC08EB07003128CC +:1078D00050DC002512E0062000EB4500205C05216D +:1078E00001EB4501615C40EA01201A9008EB0501BB +:1078F00088B21A99FCF754FD681C85B2BD42EADBD8 +:1079000001223046711CCEB201A90A541022304621 +:10791000711CCEB201A90A5401A83044216801604B +:10792000301DC6B2314601A8FCF7A4F881463046A6 +:10793000711CCEB201A901F800904FEA292230460D +:10794000711CCEB201A90A541048008AB04201DB72 +:10795000304601E00D48008A0C4948824A8AC868CE +:1079600001A9F8F73EFD0948428AC1680848FFF7B7 +:10797000BDFE93E74FF0020A01E04FF0030A0AF060 +:10798000FF011020FEF7ECFB00BF87E794130020F7 +:10799000140400202DE9F0479AB005468A460024D9 +:1079A0006878297840EA0129E878A97840EA01272F +:1079B00017B1B7F57F4F43D1B9F1370F3DDC3946E9 +:1079C0004846FCF7F5FC01222046611CCCB201A917 +:1079D0000A5405222046611CCCB201A90A5401A810 +:1079E000204429680160201DC4B2214601A8FCF78B +:1079F00041F806462046611CCCB201A90E54321251 +:107A00002046611CCCB201A90A541148008AA04248 +:107A100001DB204601E00E48008A0D4948824A8A6F +:107A2000C86801A9F8F7DDFC0948428AC16809481D +:107A3000FFF75CFE1AB0BDE8F0874FF0020801E0E6 +:107A40004FF0030841460520FEF78AFB00BFF1E72F +:107A500094130020140400202DE9F0479AB0054645 +:107A60008A46002415B91AB0BDE8F08768782978ED +:107A700040EA0127E878A97840EA0128302F3BDC6A +:107A800041463846FCF78CFC01222046611CCCB2F2 +:107A900001A90A5406222046611CCCB201A90A544D +:107AA00001A8204429680160201DC4B2214601A814 +:107AB000FBF7E0FF06462046611CCCB201A90E543C +:107AC00032122046611CCCB201A90A540E48008A29 +:107AD000A04201DB204601E00B48008A0A494882A7 +:107AE0004A8AC86801A9F8F77CFC0748428AC1683D +:107AF0000648FFF7FBFDB6E74FF0020949460620AE +:107B0000FEF72EFB00BFAEE7941300201404002004 +:107B100010B591EA030F48BF83F0004300F1C4831E +:107B2000841A71EB030C05D2121943EB0C03001BF2 +:107B300061EB0C01DFF824E14FEA1154A4EB135C74 +:107B40001EEA430F18BF9EEA445F73D023EA0E0378 +:107B5000DCF1200E21EA045143F4801332D322FADF +:107B60000CFE10EB0E0023FA0CFE41EB0E01CCF1E3 +:107B7000200E03FA0EFE10EB0E0051F10001B1F5DC +:107B8000801FCCF1200E32D201EB045112FA0EF21A +:107B9000BDE8104058BF7047401C38BF5FEA420242 +:107BA00018BF7047002814BF20F0010041F1000108 +:107BB0004FEA410313F5001F38BF7047A1F1C041E0 +:107BC00000F064BB012A43EB0302ACF1200CDCF1B2 +:107BD0001F0E32BF4FF0000E23FA0CF310EB030020 +:107BE00041EB0451B4EB115FD0D0A1EB045101F58E +:107BF000801149085FEA300001EB04510ED350F1C7 +:107C0000000038BF12FA0EFE08D1BDE81040C9E7E7 +:107C1000401C38BF5FEA4202CAD1C3E7BDE810404A +:107C20004FEA410313F5001F38BF7047A1F1C0416F +:107C300000F02CBB9EEA445F08D011EA5E0FBDE85D +:107C4000104004BF01F0004100207047BDE8104023 +:107C500070B500F0CDFA00BF64FBBE3E0000E0FF4F +:107C60002DE9C04130B4DFF8A0C23CEA111418BFBE +:107C70003CEA131400F0EC8081EA03051CEA1114BD +:107C800044EAD57418BF1CEA131500F0C780A4EBB2 +:107C900005044FF0004545EAC12145EAC32341EA06 +:107CA000505143EA525304F17F74994204F5003471 +:107CB0004FEAC0204FEAC22208BF904200F09C80E9 +:107CC0004FEA13650FF24016765D4FEA134506FB47 +:107CD00005F7C7F1807706FB07F74FEAD737A7FB11 +:107CE00003687642C8F58038A7FB06CE38BFA8F1F6 +:107CF000010807FB08E64FF0000EA6FB028CE6FB2E +:107D000003CEDCF1000CCEF1004E38BFAEF1010E17 +:107D1000A6FB0C584FF000074FF00005E6FB0E875E +:107D2000A1FB08C6A0FB07CE16EB0E0645F1000529 +:107D3000E1FB076515F1E04E7EBFA4F580345FEAF4 +:107D400046066D4116F1800745F100054FEA1727F9 +:107D50004FEA066647EA0567A6F1DE46B6F1805FA0 +:107D60004FEA15251FD9384624F0010C05EBC471E4 +:107D7000BCF1FE6F01EB0C1102D8F0BCBDE8008134 +:107D800024425CBF01F5801E9EEAC47F02D4F0BC91 +:107D9000BDE80081244238D4F0BCA1F1C041BDE867 +:107DA000004100F073BA4FEAD22242EA43524FEA4E +:107DB000D323A7FB02864FEAD02040EA415007FBBD +:107DC00003661EEA0E0F4FEAD12105FB026658BF7B +:107DD000A6EB0056B6EB00564FEA520E4EEAC37EB3 +:107DE00018EB0E0E56EB530EBDD518EB02085E4194 +:107DF0007F1C55F10005B6E74FF480154FF00007E2 +:107E00004FF000064FF00008ADE7F0BC4FF0000067 +:107E100001F1C04101F00041BDE8008111EA0C1FF1 +:107E20000CEA131500D00CE013EA0C1F00F02580BB +:107E30004FF00000F0BC81EA030101F00041BDE811 +:107E40000081F0BCBDE8004181EA030100F01EBAE8 +:107E5000F0BCBDE8004170B500F0CAF9097EFC3EF7 +:107E600000F007B881EA03014FF0000001F0004183 +:107E7000704781EA030100F009BAF0BCBDE8004197 +:107E80004FF0000021497047FFFDFBF9F7F5F4F2D0 +:107E9000F0EEEDEBE9E8E6E4E3E1E0DEDDDBDAD8A5 +:107EA000D7D5D4D3D1D0CFCDCCCBCAC8C7C6C5C403 +:107EB000C2C1C0BFBEBDBCBBBAB9B8B7B6B5B4B31A +:107EC000B2B1B0AFAEADACABAAA9A8A8A7A6A5A405 +:107ED000A3A3A2A1A09F9F9E9D9C9C9B9A999998C9 +:107EE0009797969595949393929191908F8F8E8E6C +:107EF0008D8C8C8B8B8A89898888878786858584F9 +:107F000084838382828181800000FF070000F87FE4 +:107F10004FEA41034FEA5353A3F58063D3F11E03A5 +:107F2000C8BFD3F1210C0CDD4FF0004242EAC12260 +:107F300042EA505232FA03FC8CEAE17CACEBE1708D +:107F40007047102BC4BF0020704703F5787CBCF14C +:107F5000FF3F04D06FF0004282EA2100704770B505 +:107F600000F046F94992248000207047F2E70000B3 +:107F70004FEA1153A3F58063D3F11E03A8BFD3F1D9 +:107F8000200C08DB4FF0004242EAC12252EA505274 +:107F900032FA03F0704709420BD4102BC4BF002003 +:107FA000704703F5787CBCF1FF3F05D04FF0FF3000 +:107FB00070474FF00000704770B500F019F900BF2E +:107FC0004992248000207047F0E710F0004248BF3B +:107FD0004042B0FA80F310FA03F10AD0C3F11D0356 +:107FE00003F580634FEA415002EB035202EBD121CB +:107FF00070474FF0000070477FEAE17202D1101A1B +:1080000062EB0101B1FA81F30B3B24D3994012D109 +:10801000B0FA80F310FA03F108BF7047C3F11D03F3 +:1080200003F5406303EBC2234FEAD1224FEA4150EC +:1080300002EB03517047C3F1200C20FA0CFC98406E +:10804000C3F1320303F5406303EBC22341EA0C01A1 +:1080500001EB0351704710B5C3F1320CC3F10004BA +:10806000C4F1200E0CF5406C0CEBC22201FA0EFCA0 +:1080700021FA04F100FA0EF3E040BDE8104040EAB6 +:108080000C0001EB025138BF7047401C41F1000168 +:108090005B0008BF20F0010070470000DFF848C116 +:1080A00070B51CEA111E1EBF1CEA13159EEA0C0FC8 +:1080B00095EA0C0F00F06F8081EA030423EA4C1369 +:1080C0004EEAD47E21EA4C1141F4801143F480132E +:1080D000AE44A1FB024CA0FB0365AEF17F7E3619D6 +:1080E00055EB0C05A1FB034C4CF10003A0FB021C5B +:1080F00016EB0C06654153F10003094218BF46F028 +:10810000010613F4007F0BD14FEA03314FEA05302B +:10811000340341EA155140EA16506FF003020AE0B9 +:108120004FEAC3214FEAC520F40241EA555140EA23 +:1081300056506FF0020202EB2E4201EB025585EA27 +:10814000CE710AD05FEA440C18BF24F0004450F10D +:10815000000041F1000120EAD47040F2FE7C62454B +:1081600000D270BDA84214BF4FF080444FF040448D +:10817000002E08BF0024BEF1806FA8BFA1F1C0414E +:10818000BDE8704080F282804FF0000001F1C041F4 +:1081900001F0004170479EEA0C0F0CEA131518BF5E +:1081A00095EA0C0F06D04FF0000081EA030E0EF0A6 +:1081B000004170BD00F01CF88900013E00F007B8D6 +:1081C00000F009B84FEA430C5FEA5C5C08D081EA32 +:1081D000030100F05BB84FEA410C5FEA5C5CF6D14A +:1081E0004FF00000014970470000FF070000F87FD2 +:1081F0000EF1020E2EF0030E5EF8046B364205D42B +:10820000012A43EB030515F5001F12D8012841EBA5 +:10821000010C1CF5001F0CD80ED14FEAD17C15F5CE +:10822000001F0CEB4C0C0CF1020C08BF4CEBD37C88 +:1082300004E04FF0080C01E04FEAD37C0CEB4C0556 +:1082400026FA05F606F00706B6F1040C06D20EEB88 +:10825000860CBDE870404CF0010C6047DFE80CF084 +:10826000090B02024FF000414FF00000A1F5002180 +:1082700070BD19461046012851EB010418BFD4F512 +:10828000001484BF002001F0004170BD0808A0F573 +:1082900000114FEA3101704710B591EA030F48BF52 +:1082A00083F000433FF53CAC841A71EB030C07D21A +:1082B00012198CF0004C43EB0C03001B61EB0C011A +:1082C000DFF8A4E14FEA1154A4EB135C1EEA430F5C +:1082D00018BF9EEA445F00F0B08023EA6E0352426A +:1082E00021EA0451C3EB6E0338BF5B1EDCF1200EA4 +:1082F00025D322FA0CFE10EB0E0043FA0CFE41EBE4 +:108300000E01CCF1200E03FA0EFE10EB0E0051F11F +:108310000001CCF1200E29D412FA0EF201EB045127 +:10832000BDE8104058BF7047401C1CBFB2F1004F61 +:10833000704700280CBF491C20F00100704712EB69 +:10834000020E43EB030218BF4FF0010E4EEA420249 +:10835000ACF1200CDCF11E0E54D943FA0CFE10EBEC +:108360000E0051F1FF31CCF11E0ED5D50EF1010EEC +:1083700012FA0EFE404141EB010101EB445C5FEA61 +:108380005C5C10D910EBDE7001EB045138BFBEF11C +:10839000004FBDE8104018BF704700280CBF491CB3 +:1083A00020F00100704730D24FEAD42C11F50011B3 +:1083B00024F400641BD0B1FA81F20B3AA41AA41E73 +:1083C000D2F12003914030FA03F31943904001EBBE +:1083D000CC71002C01EB0451BDE81040A8BF7047E0 +:1083E00001F1C0414FF0000001F000417047B0FAC8 +:1083F00080F310FA03F100D110BDE41A173C4805D0 +:10840000C90AE4E701EB045110BD491001EB045126 +:10841000BDE810404FEA300002E04FF00001704725 +:108420004A0008BF0042F8D0B2F5001F28BF7047CD +:1084300001F000414FF0000070479EEA445F07D012 +:1084400011EA5E0FBDE8104004BF00210020704714 +:10845000BDE8104070B5FFF7CBFE00BF40DFF63E31 +:1084600083F00041104670470000E0FF4FF040707D +:10847000E1EE100A70470006101600061016000004 +:1084800000000000000001020304060708090000C4 +:108490000000010203040000B8840008000000206E +:1084A000A0010000C4010008D8840008A001002039 +:1084B000E01A0000200200084132104201034D245E +:1084C000F43954012B02D7640518CDCC4C3D23055B +:0884D000045AFF01011032986B :040000050800018965 :00000001FF diff --git a/MDK-ARM/VOQC/VOQC.htm b/MDK-ARM/VOQC/VOQC.htm index a47c378..9adf47f 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: Thu Sep 12 10:47:07 2024 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Wed Sep 18 13:42:59 2024

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

Call chain for Maximum Stack Depth:

@@ -504,16 +504,16 @@ Global Symbols

[Calls]
  • >>   __aeabi_uldivmod
-

__aeabi_memcpy (Thumb, 0 bytes, Stack size 0 bytes, rt_memcpy_v6.o(.text)) -

[Called By]

  • >>   writesinglereg_rtu -
  • >>   writesinglecoil_rtu -
  • >>   writemultireg_rtu -
  • >>   writemulticoil_rtu -
  • >>   readinputreg_rtu -
  • >>   readholdreg_rtu -
  • >>   readdisinputstate_rtu -
  • >>   readcoilstate_rtu -
  • >>   modbus_errfunction_rtu +

    __aeabi_memcpy (Thumb, 0 bytes, Stack size 0 bytes, rt_memcpy_v6.o(.text)) +

    [Called By]

    • >>   writesinglereg_rtu +
    • >>   writesinglecoil_rtu +
    • >>   writemultireg_rtu +
    • >>   writemulticoil_rtu +
    • >>   readinputreg_rtu +
    • >>   readholdreg_rtu +
    • >>   readdisinputstate_rtu +
    • >>   readcoilstate_rtu +
    • >>   modbus_errfunction_rtu

    __rt_memcpy (Thumb, 138 bytes, Stack size 0 bytes, rt_memcpy_v6.o(.text), UNUSED) @@ -543,7 +543,7 @@ Global Symbols

  • >>   MX_TIM1_Init
  • >>   MX_GPIO_Init
  • >>   SystemClock_Config -
  • >>   readcoilstate_rtu +
  • >>   readcoilstate_rtu

__aeabi_memclr8 (Thumb, 0 bytes, Stack size 4 bytes, rt_memclr_w.o(.text), UNUSED) @@ -684,23 +684,23 @@ Global Symbols

GetHoldRegData (Thumb, 16 bytes, Stack size 0 bytes, modbus.o(i.GetHoldRegData)) -

[Called By]

  • >>   readholdreg_rtu +

    [Called By]
    • >>   readholdreg_rtu

    GetInputRegData (Thumb, 16 bytes, Stack size 0 bytes, modbus.o(i.GetInputRegData)) -

    [Called By]

    • >>   readinputreg_rtu +

      [Called By]
      • >>   readinputreg_rtu

      GetOneCoilVal (Thumb, 50 bytes, Stack size 12 bytes, modbus.o(i.GetOneCoilVal))

      [Stack]

      • Max Depth = 12
      • Call Chain = GetOneCoilVal
      -
      [Called By]
      • >>   readcoilstate_rtu +
        [Called By]
        • >>   readcoilstate_rtu

        GetOneDisInputVal (Thumb, 50 bytes, Stack size 12 bytes, modbus.o(i.GetOneDisInputVal))

        [Stack]

        • Max Depth = 12
        • Call Chain = GetOneDisInputVal
        -
        [Called By]
        • >>   readdisinputstate_rtu +
          [Called By]
          • >>   readdisinputstate_rtu

          GetSensorData (Thumb, 92 bytes, Stack size 8 bytes, mf5803.o(i.GetSensorData)) @@ -884,7 +884,7 @@ Global Symbols

        • >>   ds18b20_write_byte
        • >>   ds18b20_rst
        • >>   ds18b20_read_bit -
        • >>   setcs +
        • >>   setcs
        • >>   clrcs
        @@ -1254,7 +1254,7 @@ Global Symbols

      [Calls]
      • >>   HAL_DMA_Start_IT
      -
      [Called By]
      • >>   uart_send +
        [Called By]
        • >>   uart_send

        HAL_UART_TxCpltCallback (Thumb, 2 bytes, Stack size 0 bytes, stm32f4xx_hal_uart.o(i.HAL_UART_TxCpltCallback)) @@ -1397,19 +1397,19 @@ Global Symbols

        MemManage_Handler (Thumb, 4 bytes, Stack size 0 bytes, stm32f4xx_it.o(i.MemManage_Handler))
        [Address Reference Count : 1]

        • startup_stm32f407xx.o(RESET)
        -

        ModbusCRC16 (Thumb, 70 bytes, Stack size 12 bytes, modbus.o(i.ModbusCRC16)) +

        ModbusCRC16 (Thumb, 70 bytes, Stack size 12 bytes, modbus.o(i.ModbusCRC16))

        [Stack]

        • Max Depth = 12
        • Call Chain = ModbusCRC16
        -
        [Called By]
        • >>   writesinglereg_rtu -
        • >>   writesinglecoil_rtu -
        • >>   writemultireg_rtu -
        • >>   writemulticoil_rtu -
        • >>   readinputreg_rtu -
        • >>   readholdreg_rtu -
        • >>   readdisinputstate_rtu -
        • >>   readcoilstate_rtu +
          [Called By]
          • >>   writesinglereg_rtu +
          • >>   writesinglecoil_rtu +
          • >>   writemultireg_rtu +
          • >>   writemulticoil_rtu +
          • >>   readinputreg_rtu +
          • >>   readholdreg_rtu +
          • >>   readdisinputstate_rtu +
          • >>   readcoilstate_rtu
          • >>   modbus_process_rtu -
          • >>   modbus_errfunction_rtu +
          • >>   modbus_errfunction_rtu

          NMI_Handler (Thumb, 4 bytes, Stack size 0 bytes, stm32f4xx_it.o(i.NMI_Handler)) @@ -1535,15 +1535,15 @@ Global Symbols
          [Address Reference Count : 1]

          • startup_stm32f407xx.o(RESET)

          WriteHoldRegData (Thumb, 10 bytes, Stack size 0 bytes, modbus.o(i.WriteHoldRegData)) -

          [Called By]

          • >>   writesinglereg_rtu -
          • >>   writemultireg_rtu +

            [Called By]
            • >>   writesinglereg_rtu +
            • >>   writemultireg_rtu

            WriteOneCoilData (Thumb, 114 bytes, Stack size 16 bytes, modbus.o(i.WriteOneCoilData))

            [Stack]

            • Max Depth = 16
            • Call Chain = WriteOneCoilData
            -
            [Called By]
            • >>   writesinglecoil_rtu -
            • >>   writemulticoil_rtu +
              [Called By]
              • >>   writesinglecoil_rtu +
              • >>   writemulticoil_rtu

              _74hc165_init (Thumb, 24 bytes, Stack size 8 bytes, hc165.o(i._74hc165_init)) @@ -1568,8 +1568,8 @@ Global Symbols

              [Called By]

              • >>   __rt_exit_exit
              -

              abs_bias (Thumb, 26 bytes, Stack size 0 bytes, provalctrl.o(i.abs_bias)) -

              [Called By]

              • >>   prov_calibrate_pid +

                abs_bias (Thumb, 26 bytes, Stack size 0 bytes, provalctrl.o(i.abs_bias)) +

                [Called By]

                • >>   prov_calibrate_pid

                adcs_data (Thumb, 10 bytes, Stack size 0 bytes, adcs.o(i.adcs_data)) @@ -1957,7 +1957,7 @@ Global Symbols

              • >>   main
              -

              encoder_run (Thumb, 116 bytes, Stack size 0 bytes, encoder.o(i.encoder_run)) +

              encoder_run (Thumb, 116 bytes, Stack size 0 bytes, encoder.o(i.encoder_run))

              [Called By]

              • >>   main
              @@ -2034,15 +2034,13 @@ Global Symbols
              [Called By]
              • >>   digital_ctrl
              -

              main (Thumb, 138 bytes, Stack size 0 bytes, main.o(i.main)) +

              main (Thumb, 130 bytes, Stack size 0 bytes, main.o(i.main))

              [Stack]

              • Max Depth = 176
              • Call Chain = main ⇒ SystemClock_Config ⇒ HAL_RCC_ClockConfig ⇒ HAL_RCC_GetSysClockFreq ⇒ __aeabi_uldivmod

              [Calls]
              • >>   prov_init -
              • >>   prov_adj_section_init -
              • >>   prov_adj_init
              • >>   modbus_rtu_init
              • >>   mf5803_setup -
              • >>   encoder_run +
              • >>   encoder_run
              • >>   encoder_init
              • >>   ee_io_init
              • >>   ds18b20_init @@ -2089,50 +2087,50 @@ Global Symbols
                [Calls]
                • >>   HAL_GPIO_WritePin
                • >>   delay_ms
                • >>   wf5803_WriteReg -
                • >>   setcs +
                • >>   setcs

                [Called By]
                • >>   main
                -

                modbus_analysis_rtu (Thumb, 180 bytes, Stack size 24 bytes, modbus_rtu.o(i.modbus_analysis_rtu)) +

                modbus_analysis_rtu (Thumb, 180 bytes, Stack size 24 bytes, modbus_rtu.o(i.modbus_analysis_rtu))

                [Stack]

                • Max Depth = 396
                • Call Chain = modbus_analysis_rtu ⇒ writemulticoil_rtu ⇒ modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                -
                [Calls]
                • >>   writesinglereg_rtu -
                • >>   writesinglecoil_rtu -
                • >>   writemultireg_rtu -
                • >>   writemulticoil_rtu -
                • >>   readinputreg_rtu -
                • >>   readholdreg_rtu -
                • >>   readdisinputstate_rtu -
                • >>   readcoilstate_rtu -
                • >>   modbus_errfunction_rtu +
                  [Calls]
                  • >>   writesinglereg_rtu +
                  • >>   writesinglecoil_rtu +
                  • >>   writemultireg_rtu +
                  • >>   writemulticoil_rtu +
                  • >>   readinputreg_rtu +
                  • >>   readholdreg_rtu +
                  • >>   readdisinputstate_rtu +
                  • >>   readcoilstate_rtu +
                  • >>   modbus_errfunction_rtu

                  [Called By]
                  • >>   modbus_process_rtu
                  -

                  modbus_errfunction_rtu (Thumb, 118 bytes, Stack size 120 bytes, modbus_rtu.o(i.modbus_errfunction_rtu)) +

                  modbus_errfunction_rtu (Thumb, 118 bytes, Stack size 120 bytes, modbus_rtu.o(i.modbus_errfunction_rtu))

                  [Stack]

                  • Max Depth = 212
                  • Call Chain = modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                  -
                  [Calls]
                  • >>   uart_send -
                  • >>   ModbusCRC16 -
                  • >>   __aeabi_memcpy +
                    [Calls]
                    • >>   uart_send +
                    • >>   ModbusCRC16 +
                    • >>   __aeabi_memcpy
                    -
                    [Called By]
                    • >>   writesinglereg_rtu -
                    • >>   writesinglecoil_rtu -
                    • >>   writemultireg_rtu -
                    • >>   writemulticoil_rtu -
                    • >>   readinputreg_rtu -
                    • >>   readholdreg_rtu -
                    • >>   readdisinputstate_rtu -
                    • >>   readcoilstate_rtu -
                    • >>   modbus_analysis_rtu +
                      [Called By]
                      • >>   writesinglereg_rtu +
                      • >>   writesinglecoil_rtu +
                      • >>   writemultireg_rtu +
                      • >>   writemulticoil_rtu +
                      • >>   readinputreg_rtu +
                      • >>   readholdreg_rtu +
                      • >>   readdisinputstate_rtu +
                      • >>   readcoilstate_rtu +
                      • >>   modbus_analysis_rtu

                      modbus_process_rtu (Thumb, 64 bytes, Stack size 24 bytes, modbus_rtu.o(i.modbus_process_rtu))

                      [Stack]

                      • Max Depth = 420
                      • Call Chain = modbus_process_rtu ⇒ modbus_analysis_rtu ⇒ writemulticoil_rtu ⇒ modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                      -
                      [Calls]
                      • >>   modbus_analysis_rtu -
                      • >>   ModbusCRC16 +
                        [Calls]
                        • >>   modbus_analysis_rtu +
                        • >>   ModbusCRC16

                        [Called By]
                        • >>   HAL_TIM_PeriodElapsedCallback
                        @@ -2157,12 +2155,11 @@ Global Symbols
                        [Called By]
                        • >>   HAL_UART_RxCpltCallback
                        -

                        prov_adj_init (Thumb, 168 bytes, Stack size 0 bytes, provalctrl.o(i.prov_adj_init)) -

                        [Called By]

                        • >>   main -
                        • >>   prov_ctrl +

                          prov_adj_init (Thumb, 80 bytes, Stack size 0 bytes, provalctrl.o(i.prov_adj_init)) +

                          [Called By]

                          • >>   prov_ctrl
                          -

                          prov_adj_section (Thumb, 576 bytes, Stack size 16 bytes, provalctrl.o(i.prov_adj_section)) +

                          prov_adj_section (Thumb, 600 bytes, Stack size 16 bytes, provalctrl.o(i.prov_adj_section))

                          [Stack]

                          • Max Depth = 32
                          • Call Chain = prov_adj_section ⇒ prov_set

                          [Calls]
                          • >>   prov_set @@ -2170,26 +2167,25 @@ Global Symbols
                            [Called By]
                            • >>   prov_ctrl
                            -

                            prov_adj_section_init (Thumb, 122 bytes, Stack size 0 bytes, provalctrl.o(i.prov_adj_section_init)) -

                            [Called By]

                            • >>   main -
                            • >>   prov_ctrl +

                              prov_adj_section_init (Thumb, 64 bytes, Stack size 0 bytes, provalctrl.o(i.prov_adj_section_init)) +

                              [Called By]

                              • >>   prov_ctrl
                              -

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

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

                              [Stack]

                              • Max Depth = 8
                              • Call Chain = prov_calibrate_pid
                              -
                              [Calls]
                              • >>   abs_bias +
                                [Calls]
                                • >>   abs_bias

                                [Called By]
                                • >>   prov_ctrl
                                -

                                prov_ctrl (Thumb, 102 bytes, Stack size 16 bytes, provalctrl.o(i.prov_ctrl)) +

                                prov_ctrl (Thumb, 108 bytes, Stack size 16 bytes, provalctrl.o(i.prov_ctrl))

                                [Stack]

                                • Max Depth = 48
                                • Call Chain = prov_ctrl ⇒ prov_adj_section ⇒ prov_set
                                -
                                [Calls]
                                • >>   prov_adj_section_init -
                                • >>   prov_adj_init -
                                • >>   prov_calibrate_pid -
                                • >>   prov_adj_section +
                                  [Calls]
                                  • >>   prov_calibrate_pid +
                                  • >>   prov_adj_section_init +
                                  • >>   prov_adj_section +
                                  • >>   prov_adj_init

                                  [Called By]
                                  • >>   analog_ctrl
                                  @@ -2213,59 +2209,59 @@ Global Symbols
                                  [Calls]
                                  • >>   prov_section_calculate

                                  [Called By]
                                  • >>   analog_ctrl -
                                  • >>   prov_adj_section +
                                  • >>   prov_adj_section
                                  -

                                  readcoilstate_rtu (Thumb, 326 bytes, Stack size 152 bytes, modbus_rtu.o(i.readcoilstate_rtu)) +

                                  readcoilstate_rtu (Thumb, 326 bytes, Stack size 152 bytes, modbus_rtu.o(i.readcoilstate_rtu))

                                  [Stack]

                                  • Max Depth = 364
                                  • Call Chain = readcoilstate_rtu ⇒ modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                                  -
                                  [Calls]
                                  • >>   uart_send -
                                  • >>   modbus_errfunction_rtu -
                                  • >>   ModbusCRC16 +
                                    [Calls]
                                    • >>   uart_send +
                                    • >>   modbus_errfunction_rtu +
                                    • >>   ModbusCRC16
                                    • >>   GetOneCoilVal
                                    • >>   __aeabi_memclr4 -
                                    • >>   __aeabi_memcpy +
                                    • >>   __aeabi_memcpy
                                    -
                                    [Called By]
                                    • >>   modbus_analysis_rtu +
                                      [Called By]
                                      • >>   modbus_analysis_rtu
                                      -

                                      readdisinputstate_rtu (Thumb, 322 bytes, Stack size 152 bytes, modbus_rtu.o(i.readdisinputstate_rtu)) +

                                      readdisinputstate_rtu (Thumb, 322 bytes, Stack size 152 bytes, modbus_rtu.o(i.readdisinputstate_rtu))

                                      [Stack]

                                      • Max Depth = 364
                                      • Call Chain = readdisinputstate_rtu ⇒ modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                                      -
                                      [Calls]
                                      • >>   uart_send -
                                      • >>   modbus_errfunction_rtu -
                                      • >>   ModbusCRC16 +
                                        [Calls]
                                        • >>   uart_send +
                                        • >>   modbus_errfunction_rtu +
                                        • >>   ModbusCRC16
                                        • >>   GetOneDisInputVal -
                                        • >>   __aeabi_memcpy +
                                        • >>   __aeabi_memcpy
                                        -
                                        [Called By]
                                        • >>   modbus_analysis_rtu +
                                          [Called By]
                                          • >>   modbus_analysis_rtu
                                          -

                                          readholdreg_rtu (Thumb, 258 bytes, Stack size 136 bytes, modbus_rtu.o(i.readholdreg_rtu)) +

                                          readholdreg_rtu (Thumb, 258 bytes, Stack size 136 bytes, modbus_rtu.o(i.readholdreg_rtu))

                                          [Stack]

                                          • Max Depth = 348
                                          • Call Chain = readholdreg_rtu ⇒ modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                                          -
                                          [Calls]
                                          • >>   uart_send -
                                          • >>   modbus_errfunction_rtu -
                                          • >>   ModbusCRC16 +
                                            [Calls]
                                            • >>   uart_send +
                                            • >>   modbus_errfunction_rtu +
                                            • >>   ModbusCRC16
                                            • >>   GetHoldRegData -
                                            • >>   __aeabi_memcpy +
                                            • >>   __aeabi_memcpy
                                            -
                                            [Called By]
                                            • >>   modbus_analysis_rtu +
                                              [Called By]
                                              • >>   modbus_analysis_rtu
                                              -

                                              readinputreg_rtu (Thumb, 252 bytes, Stack size 136 bytes, modbus_rtu.o(i.readinputreg_rtu)) +

                                              readinputreg_rtu (Thumb, 252 bytes, Stack size 136 bytes, modbus_rtu.o(i.readinputreg_rtu))

                                              [Stack]

                                              • Max Depth = 348
                                              • Call Chain = readinputreg_rtu ⇒ modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                                              -
                                              [Calls]
                                              • >>   uart_send -
                                              • >>   modbus_errfunction_rtu -
                                              • >>   ModbusCRC16 +
                                                [Calls]
                                                • >>   uart_send +
                                                • >>   modbus_errfunction_rtu +
                                                • >>   ModbusCRC16
                                                • >>   GetInputRegData -
                                                • >>   __aeabi_memcpy +
                                                • >>   __aeabi_memcpy
                                                -
                                                [Called By]
                                                • >>   modbus_analysis_rtu +
                                                  [Called By]
                                                  • >>   modbus_analysis_rtu
                                                  -

                                                  setcs (Thumb, 86 bytes, Stack size 8 bytes, ms5803.o(i.setcs)) +

                                                  setcs (Thumb, 86 bytes, Stack size 8 bytes, ms5803.o(i.setcs))

                                                  [Stack]

                                                  • Max Depth = 8
                                                  • Call Chain = setcs

                                                  [Calls]
                                                  • >>   HAL_GPIO_WritePin @@ -2279,20 +2275,20 @@ Global Symbols

                                                    [Called By]
                                                    • >>   HAL_TIM_PeriodElapsedCallback
                                                    -

                                                    uart_send (Thumb, 20 bytes, Stack size 16 bytes, uarts.o(i.uart_send)) +

                                                    uart_send (Thumb, 20 bytes, Stack size 16 bytes, uarts.o(i.uart_send))

                                                    [Stack]

                                                    • Max Depth = 92
                                                    • Call Chain = uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig

                                                    [Calls]
                                                    • >>   HAL_UART_Transmit_DMA
                                                    -
                                                    [Called By]
                                                    • >>   writesinglereg_rtu -
                                                    • >>   writesinglecoil_rtu -
                                                    • >>   writemultireg_rtu -
                                                    • >>   writemulticoil_rtu -
                                                    • >>   readinputreg_rtu -
                                                    • >>   readholdreg_rtu -
                                                    • >>   readdisinputstate_rtu -
                                                    • >>   readcoilstate_rtu -
                                                    • >>   modbus_errfunction_rtu +
                                                      [Called By]
                                                      • >>   writesinglereg_rtu +
                                                      • >>   writesinglecoil_rtu +
                                                      • >>   writemultireg_rtu +
                                                      • >>   writemulticoil_rtu +
                                                      • >>   readinputreg_rtu +
                                                      • >>   readholdreg_rtu +
                                                      • >>   readdisinputstate_rtu +
                                                      • >>   readcoilstate_rtu +
                                                      • >>   modbus_errfunction_rtu

                                                      wf5803_ReadReg (Thumb, 34 bytes, Stack size 16 bytes, mf5803.o(i.wf5803_ReadReg)) @@ -2300,7 +2296,7 @@ Global Symbols


                                                    [Calls]
                                                    • >>   SPI_Write_OneByte
                                                    • >>   SPI_Read_OneByte -
                                                    • >>   setcs +
                                                    • >>   setcs
                                                    • >>   clrcs

                                                    [Called By]
                                                    • >>   GetSensorData @@ -2310,59 +2306,59 @@ Global Symbols

                                                      [Stack]
                                                      • Max Depth = 32
                                                      • Call Chain = wf5803_WriteReg ⇒ SPI_Write_OneByte

                                                      [Calls]
                                                      • >>   SPI_Write_OneByte -
                                                      • >>   setcs +
                                                      • >>   setcs
                                                      • >>   clrcs

                                                      [Called By]
                                                      • >>   mf5803_setup
                                                      • >>   GetSensorData
                                                      -

                                                      writemulticoil_rtu (Thumb, 322 bytes, Stack size 160 bytes, modbus_rtu.o(i.writemulticoil_rtu)) +

                                                      writemulticoil_rtu (Thumb, 322 bytes, Stack size 160 bytes, modbus_rtu.o(i.writemulticoil_rtu))

                                                      [Stack]

                                                      • Max Depth = 372
                                                      • Call Chain = writemulticoil_rtu ⇒ modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                                                      -
                                                      [Calls]
                                                      • >>   uart_send -
                                                      • >>   modbus_errfunction_rtu +
                                                        [Calls]
                                                        • >>   uart_send +
                                                        • >>   modbus_errfunction_rtu
                                                        • >>   WriteOneCoilData -
                                                        • >>   ModbusCRC16 -
                                                        • >>   __aeabi_memcpy +
                                                        • >>   ModbusCRC16 +
                                                        • >>   __aeabi_memcpy
                                                        -
                                                        [Called By]
                                                        • >>   modbus_analysis_rtu +
                                                          [Called By]
                                                          • >>   modbus_analysis_rtu
                                                          -

                                                          writemultireg_rtu (Thumb, 252 bytes, Stack size 144 bytes, modbus_rtu.o(i.writemultireg_rtu)) +

                                                          writemultireg_rtu (Thumb, 252 bytes, Stack size 144 bytes, modbus_rtu.o(i.writemultireg_rtu))

                                                          [Stack]

                                                          • Max Depth = 356
                                                          • Call Chain = writemultireg_rtu ⇒ modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                                                          -
                                                          [Calls]
                                                          • >>   uart_send -
                                                          • >>   modbus_errfunction_rtu +
                                                            [Calls]
                                                            • >>   uart_send +
                                                            • >>   modbus_errfunction_rtu
                                                            • >>   WriteHoldRegData -
                                                            • >>   ModbusCRC16 -
                                                            • >>   __aeabi_memcpy +
                                                            • >>   ModbusCRC16 +
                                                            • >>   __aeabi_memcpy
                                                            -
                                                            [Called By]
                                                            • >>   modbus_analysis_rtu +
                                                              [Called By]
                                                              • >>   modbus_analysis_rtu
                                                              -

                                                              writesinglecoil_rtu (Thumb, 188 bytes, Stack size 136 bytes, modbus_rtu.o(i.writesinglecoil_rtu)) +

                                                              writesinglecoil_rtu (Thumb, 188 bytes, Stack size 136 bytes, modbus_rtu.o(i.writesinglecoil_rtu))

                                                              [Stack]

                                                              • Max Depth = 348
                                                              • Call Chain = writesinglecoil_rtu ⇒ modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                                                              -
                                                              [Calls]
                                                              • >>   uart_send -
                                                              • >>   modbus_errfunction_rtu +
                                                                [Calls]
                                                                • >>   uart_send +
                                                                • >>   modbus_errfunction_rtu
                                                                • >>   WriteOneCoilData -
                                                                • >>   ModbusCRC16 -
                                                                • >>   __aeabi_memcpy +
                                                                • >>   ModbusCRC16 +
                                                                • >>   __aeabi_memcpy
                                                                -
                                                                [Called By]
                                                                • >>   modbus_analysis_rtu +
                                                                  [Called By]
                                                                  • >>   modbus_analysis_rtu
                                                                  -

                                                                  writesinglereg_rtu (Thumb, 176 bytes, Stack size 136 bytes, modbus_rtu.o(i.writesinglereg_rtu)) +

                                                                  writesinglereg_rtu (Thumb, 176 bytes, Stack size 136 bytes, modbus_rtu.o(i.writesinglereg_rtu))

                                                                  [Stack]

                                                                  • Max Depth = 348
                                                                  • Call Chain = writesinglereg_rtu ⇒ modbus_errfunction_rtu ⇒ uart_send ⇒ HAL_UART_Transmit_DMA ⇒ HAL_DMA_Start_IT ⇒ DMA_SetConfig
                                                                  -
                                                                  [Calls]
                                                                  • >>   uart_send -
                                                                  • >>   modbus_errfunction_rtu +
                                                                    [Calls]
                                                                    • >>   uart_send +
                                                                    • >>   modbus_errfunction_rtu
                                                                    • >>   WriteHoldRegData -
                                                                    • >>   ModbusCRC16 -
                                                                    • >>   __aeabi_memcpy +
                                                                    • >>   ModbusCRC16 +
                                                                    • >>   __aeabi_memcpy
                                                                    -
                                                                    [Called By]
                                                                    • >>   modbus_analysis_rtu +
                                                                      [Called By]
                                                                      • >>   modbus_analysis_rtu

                                                                      __aeabi_dadd (Thumb, 0 bytes, Stack size 16 bytes, daddsub_clz.o(x$fpl$dadd), UNUSED) diff --git a/MDK-ARM/VOQC/VOQC.map b/MDK-ARM/VOQC/VOQC.map index ada9008..4c61cec 100644 --- a/MDK-ARM/VOQC/VOQC.map +++ b/MDK-ARM/VOQC/VOQC.map @@ -69,8 +69,6 @@ Section Cross References main.o(i.main) refers to modbus_rtu.o(i.modbus_rtu_init) for modbus_rtu_init main.o(i.main) refers to eeprom.o(i.ee_io_init) for ee_io_init main.o(i.main) refers to provalctrl.o(i.prov_init) for prov_init - main.o(i.main) refers to provalctrl.o(i.prov_adj_init) for prov_adj_init - main.o(i.main) refers to provalctrl.o(i.prov_adj_section_init) for prov_adj_section_init main.o(i.main) refers to gpios.o(i.digital_ctrl) for digital_ctrl main.o(i.main) refers to adcs.o(i.analog_gather) for analog_gather main.o(i.main) refers to provalctrl.o(i.analog_ctrl) for analog_ctrl @@ -1564,12 +1562,11 @@ Section Cross References provalctrl.o(i.prov_adj) refers to provalctrl.o(i.prov_adj_init) for prov_adj_init provalctrl.o(i.prov_adj) refers to provalctrl.o(.bss) for data_wr 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_adj_section) refers to provalctrl.o(i.prov_set) for prov_set provalctrl.o(i.prov_adj_section) refers to provalctrl.o(.data) for astep_s provalctrl.o(i.prov_adj_section) refers to timer.o(.data) for tick500ms provalctrl.o(i.prov_adj_section) refers to modbus.o(.bss) for InputReg - provalctrl.o(i.prov_adj_section_init) refers to provalctrl.o(.bss) for adj_pv1 + provalctrl.o(i.prov_adj_section) refers to modbus.o(.data) for CoilState 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 @@ -2653,7 +2650,7 @@ Removing Unused input sections from the image. Removing provalctrl.o(.rev16_text), (4 bytes). Removing provalctrl.o(.revsh_text), (4 bytes). Removing provalctrl.o(.rrx_text), (6 bytes). - Removing provalctrl.o(i.prov_adj), (1684 bytes). + Removing provalctrl.o(i.prov_adj), (1688 bytes). Removing encoder.o(.rev16_text), (4 bytes). Removing encoder.o(.revsh_text), (4 bytes). Removing encoder.o(.rrx_text), (6 bytes). @@ -2665,7 +2662,7 @@ Removing Unused input sections from the image. Removing flash.o(i.STMFLASH_ReadWord), (6 bytes). Removing flash.o(i.WriteFlashData), (176 bytes). -760 unused section(s) (total 82589 bytes) removed from the image. +760 unused section(s) (total 82593 bytes) removed from the image. ============================================================================== @@ -3184,63 +3181,63 @@ Image Symbol Table i.i2c_waitack 0x08005d60 Section 0 eeprom.o(i.i2c_waitack) i.led_ctrl 0x08005d98 Section 0 gpios.o(i.led_ctrl) i.main 0x08005dbc Section 0 main.o(i.main) - i.mf5803_loop 0x08005e4c Section 0 mf5803.o(i.mf5803_loop) - i.mf5803_setup 0x08005ff4 Section 0 mf5803.o(i.mf5803_setup) - i.modbus_analysis_rtu 0x080060b4 Section 0 modbus_rtu.o(i.modbus_analysis_rtu) - i.modbus_errfunction_rtu 0x08006168 Section 0 modbus_rtu.o(i.modbus_errfunction_rtu) - i.modbus_process_rtu 0x080061e8 Section 0 modbus_rtu.o(i.modbus_process_rtu) - i.modbus_rtu_init 0x0800622c Section 0 modbus_rtu.o(i.modbus_rtu_init) - i.modbus_rx_cb 0x08006280 Section 0 modbus_rtu.o(i.modbus_rx_cb) - i.prov_adj_init 0x08006304 Section 0 provalctrl.o(i.prov_adj_init) - i.prov_adj_section 0x080063bc Section 0 provalctrl.o(i.prov_adj_section) - i.prov_adj_section_init 0x0800662c Section 0 provalctrl.o(i.prov_adj_section_init) - i.prov_calibrate_pid 0x080066b4 Section 0 provalctrl.o(i.prov_calibrate_pid) - i.prov_ctrl 0x08006a80 Section 0 provalctrl.o(i.prov_ctrl) - i.prov_init 0x08006af0 Section 0 provalctrl.o(i.prov_init) - i.prov_section_calculate 0x08006d90 Section 0 provalctrl.o(i.prov_section_calculate) - i.prov_set 0x08006e70 Section 0 provalctrl.o(i.prov_set) - i.readcoilstate_rtu 0x0800705c Section 0 modbus_rtu.o(i.readcoilstate_rtu) - i.readdisinputstate_rtu 0x080071ac Section 0 modbus_rtu.o(i.readdisinputstate_rtu) - i.readholdreg_rtu 0x080072f8 Section 0 modbus_rtu.o(i.readholdreg_rtu) - i.readinputreg_rtu 0x08007404 Section 0 modbus_rtu.o(i.readinputreg_rtu) - i.setcs 0x08007508 Section 0 ms5803.o(i.setcs) - i.tim6_cnt 0x08007570 Section 0 timer.o(i.tim6_cnt) - i.uart_send 0x0800777c Section 0 uarts.o(i.uart_send) - i.wf5803_ReadReg 0x08007790 Section 0 mf5803.o(i.wf5803_ReadReg) - i.wf5803_WriteReg 0x080077b2 Section 0 mf5803.o(i.wf5803_WriteReg) - i.writemulticoil_rtu 0x080077d4 Section 0 modbus_rtu.o(i.writemulticoil_rtu) - i.writemultireg_rtu 0x08007920 Section 0 modbus_rtu.o(i.writemultireg_rtu) - i.writesinglecoil_rtu 0x08007a24 Section 0 modbus_rtu.o(i.writesinglecoil_rtu) - i.writesinglereg_rtu 0x08007ae8 Section 0 modbus_rtu.o(i.writesinglereg_rtu) - x$fpl$dadd 0x08007ba0 Section 336 daddsub_clz.o(x$fpl$dadd) - $v0 0x08007ba0 Number 0 daddsub_clz.o(x$fpl$dadd) - _dadd1 0x08007bb1 Thumb Code 0 daddsub_clz.o(x$fpl$dadd) - x$fpl$ddiv 0x08007cf0 Section 688 ddiv.o(x$fpl$ddiv) - $v0 0x08007cf0 Number 0 ddiv.o(x$fpl$ddiv) - ddiv_entry 0x08007cf7 Thumb Code 0 ddiv.o(x$fpl$ddiv) - x$fpl$dfix 0x08007fa0 Section 94 dfix.o(x$fpl$dfix) - $v0 0x08007fa0 Number 0 dfix.o(x$fpl$dfix) - x$fpl$dfixu 0x08008000 Section 90 dfixu.o(x$fpl$dfixu) - $v0 0x08008000 Number 0 dfixu.o(x$fpl$dfixu) - x$fpl$dflt 0x0800805a Section 46 dflt_clz.o(x$fpl$dflt) - $v0 0x0800805a Number 0 dflt_clz.o(x$fpl$dflt) - x$fpl$dfltll 0x08008088 Section 162 dfltll_clz.o(x$fpl$dfltll) - $v0 0x08008088 Number 0 dfltll_clz.o(x$fpl$dfltll) - x$fpl$dmul 0x0800812c Section 340 dmul.o(x$fpl$dmul) - $v0 0x0800812c Number 0 dmul.o(x$fpl$dmul) - x$fpl$dnaninf 0x08008280 Section 156 dnaninf.o(x$fpl$dnaninf) - $v0 0x08008280 Number 0 dnaninf.o(x$fpl$dnaninf) - x$fpl$dretinf 0x0800831c Section 12 dretinf.o(x$fpl$dretinf) - $v0 0x0800831c Number 0 dretinf.o(x$fpl$dretinf) - x$fpl$dsub 0x08008328 Section 468 daddsub_clz.o(x$fpl$dsub) - $v0 0x08008328 Number 0 daddsub_clz.o(x$fpl$dsub) - _dsub1 0x08008339 Thumb Code 0 daddsub_clz.o(x$fpl$dsub) - x$fpl$fpinit 0x080084fc Section 10 fpinit.o(x$fpl$fpinit) - $v0 0x080084fc Number 0 fpinit.o(x$fpl$fpinit) - .constdata 0x08008506 Section 8 stm32f4xx_hal_dma.o(.constdata) - x$fpl$usenofp 0x08008506 Section 0 usenofp.o(x$fpl$usenofp) - flagBitshiftOffset 0x08008506 Data 8 stm32f4xx_hal_dma.o(.constdata) - .constdata 0x0800850e Section 24 system_stm32f4xx.o(.constdata) + i.mf5803_loop 0x08005e44 Section 0 mf5803.o(i.mf5803_loop) + i.mf5803_setup 0x08005fec Section 0 mf5803.o(i.mf5803_setup) + i.modbus_analysis_rtu 0x080060ac Section 0 modbus_rtu.o(i.modbus_analysis_rtu) + i.modbus_errfunction_rtu 0x08006160 Section 0 modbus_rtu.o(i.modbus_errfunction_rtu) + i.modbus_process_rtu 0x080061e0 Section 0 modbus_rtu.o(i.modbus_process_rtu) + i.modbus_rtu_init 0x08006224 Section 0 modbus_rtu.o(i.modbus_rtu_init) + i.modbus_rx_cb 0x08006278 Section 0 modbus_rtu.o(i.modbus_rx_cb) + i.prov_adj_init 0x080062fc Section 0 provalctrl.o(i.prov_adj_init) + i.prov_adj_section 0x08006354 Section 0 provalctrl.o(i.prov_adj_section) + i.prov_adj_section_init 0x080065dc Section 0 provalctrl.o(i.prov_adj_section_init) + i.prov_calibrate_pid 0x08006620 Section 0 provalctrl.o(i.prov_calibrate_pid) + i.prov_ctrl 0x080069ec Section 0 provalctrl.o(i.prov_ctrl) + i.prov_init 0x08006a60 Section 0 provalctrl.o(i.prov_init) + i.prov_section_calculate 0x08006d00 Section 0 provalctrl.o(i.prov_section_calculate) + i.prov_set 0x08006de0 Section 0 provalctrl.o(i.prov_set) + i.readcoilstate_rtu 0x08006fcc Section 0 modbus_rtu.o(i.readcoilstate_rtu) + i.readdisinputstate_rtu 0x0800711c Section 0 modbus_rtu.o(i.readdisinputstate_rtu) + i.readholdreg_rtu 0x08007268 Section 0 modbus_rtu.o(i.readholdreg_rtu) + i.readinputreg_rtu 0x08007374 Section 0 modbus_rtu.o(i.readinputreg_rtu) + i.setcs 0x08007478 Section 0 ms5803.o(i.setcs) + i.tim6_cnt 0x080074e0 Section 0 timer.o(i.tim6_cnt) + i.uart_send 0x080076ec Section 0 uarts.o(i.uart_send) + i.wf5803_ReadReg 0x08007700 Section 0 mf5803.o(i.wf5803_ReadReg) + i.wf5803_WriteReg 0x08007722 Section 0 mf5803.o(i.wf5803_WriteReg) + i.writemulticoil_rtu 0x08007744 Section 0 modbus_rtu.o(i.writemulticoil_rtu) + i.writemultireg_rtu 0x08007890 Section 0 modbus_rtu.o(i.writemultireg_rtu) + i.writesinglecoil_rtu 0x08007994 Section 0 modbus_rtu.o(i.writesinglecoil_rtu) + i.writesinglereg_rtu 0x08007a58 Section 0 modbus_rtu.o(i.writesinglereg_rtu) + x$fpl$dadd 0x08007b10 Section 336 daddsub_clz.o(x$fpl$dadd) + $v0 0x08007b10 Number 0 daddsub_clz.o(x$fpl$dadd) + _dadd1 0x08007b21 Thumb Code 0 daddsub_clz.o(x$fpl$dadd) + x$fpl$ddiv 0x08007c60 Section 688 ddiv.o(x$fpl$ddiv) + $v0 0x08007c60 Number 0 ddiv.o(x$fpl$ddiv) + ddiv_entry 0x08007c67 Thumb Code 0 ddiv.o(x$fpl$ddiv) + x$fpl$dfix 0x08007f10 Section 94 dfix.o(x$fpl$dfix) + $v0 0x08007f10 Number 0 dfix.o(x$fpl$dfix) + x$fpl$dfixu 0x08007f70 Section 90 dfixu.o(x$fpl$dfixu) + $v0 0x08007f70 Number 0 dfixu.o(x$fpl$dfixu) + x$fpl$dflt 0x08007fca Section 46 dflt_clz.o(x$fpl$dflt) + $v0 0x08007fca Number 0 dflt_clz.o(x$fpl$dflt) + x$fpl$dfltll 0x08007ff8 Section 162 dfltll_clz.o(x$fpl$dfltll) + $v0 0x08007ff8 Number 0 dfltll_clz.o(x$fpl$dfltll) + x$fpl$dmul 0x0800809c Section 340 dmul.o(x$fpl$dmul) + $v0 0x0800809c Number 0 dmul.o(x$fpl$dmul) + x$fpl$dnaninf 0x080081f0 Section 156 dnaninf.o(x$fpl$dnaninf) + $v0 0x080081f0 Number 0 dnaninf.o(x$fpl$dnaninf) + x$fpl$dretinf 0x0800828c Section 12 dretinf.o(x$fpl$dretinf) + $v0 0x0800828c Number 0 dretinf.o(x$fpl$dretinf) + x$fpl$dsub 0x08008298 Section 468 daddsub_clz.o(x$fpl$dsub) + $v0 0x08008298 Number 0 daddsub_clz.o(x$fpl$dsub) + _dsub1 0x080082a9 Thumb Code 0 daddsub_clz.o(x$fpl$dsub) + x$fpl$fpinit 0x0800846c Section 10 fpinit.o(x$fpl$fpinit) + $v0 0x0800846c Number 0 fpinit.o(x$fpl$fpinit) + .constdata 0x08008476 Section 8 stm32f4xx_hal_dma.o(.constdata) + x$fpl$usenofp 0x08008476 Section 0 usenofp.o(x$fpl$usenofp) + flagBitshiftOffset 0x08008476 Data 8 stm32f4xx_hal_dma.o(.constdata) + .constdata 0x0800847e 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) @@ -3638,61 +3635,61 @@ Image Symbol Table i2c_stop 0x08005d3d Thumb Code 30 eeprom.o(i.i2c_stop) i2c_waitack 0x08005d61 Thumb Code 50 eeprom.o(i.i2c_waitack) led_ctrl 0x08005d99 Thumb Code 26 gpios.o(i.led_ctrl) - main 0x08005dbd Thumb Code 138 main.o(i.main) - mf5803_loop 0x08005e4d Thumb Code 376 mf5803.o(i.mf5803_loop) - mf5803_setup 0x08005ff5 Thumb Code 184 mf5803.o(i.mf5803_setup) - modbus_analysis_rtu 0x080060b5 Thumb Code 180 modbus_rtu.o(i.modbus_analysis_rtu) - modbus_errfunction_rtu 0x08006169 Thumb Code 118 modbus_rtu.o(i.modbus_errfunction_rtu) - modbus_process_rtu 0x080061e9 Thumb Code 64 modbus_rtu.o(i.modbus_process_rtu) - modbus_rtu_init 0x0800622d Thumb Code 58 modbus_rtu.o(i.modbus_rtu_init) - modbus_rx_cb 0x08006281 Thumb Code 98 modbus_rtu.o(i.modbus_rx_cb) - prov_adj_init 0x08006305 Thumb Code 168 provalctrl.o(i.prov_adj_init) - prov_adj_section 0x080063bd Thumb Code 576 provalctrl.o(i.prov_adj_section) - prov_adj_section_init 0x0800662d Thumb Code 122 provalctrl.o(i.prov_adj_section_init) - prov_calibrate_pid 0x080066b5 Thumb Code 944 provalctrl.o(i.prov_calibrate_pid) - prov_ctrl 0x08006a81 Thumb Code 102 provalctrl.o(i.prov_ctrl) - prov_init 0x08006af1 Thumb Code 634 provalctrl.o(i.prov_init) - prov_section_calculate 0x08006d91 Thumb Code 218 provalctrl.o(i.prov_section_calculate) - prov_set 0x08006e71 Thumb Code 472 provalctrl.o(i.prov_set) - readcoilstate_rtu 0x0800705d Thumb Code 326 modbus_rtu.o(i.readcoilstate_rtu) - readdisinputstate_rtu 0x080071ad Thumb Code 322 modbus_rtu.o(i.readdisinputstate_rtu) - readholdreg_rtu 0x080072f9 Thumb Code 258 modbus_rtu.o(i.readholdreg_rtu) - readinputreg_rtu 0x08007405 Thumb Code 252 modbus_rtu.o(i.readinputreg_rtu) - setcs 0x08007509 Thumb Code 86 ms5803.o(i.setcs) - tim6_cnt 0x08007571 Thumb Code 420 timer.o(i.tim6_cnt) - uart_send 0x0800777d Thumb Code 20 uarts.o(i.uart_send) - wf5803_ReadReg 0x08007791 Thumb Code 34 mf5803.o(i.wf5803_ReadReg) - wf5803_WriteReg 0x080077b3 Thumb Code 34 mf5803.o(i.wf5803_WriteReg) - writemulticoil_rtu 0x080077d5 Thumb Code 322 modbus_rtu.o(i.writemulticoil_rtu) - writemultireg_rtu 0x08007921 Thumb Code 252 modbus_rtu.o(i.writemultireg_rtu) - writesinglecoil_rtu 0x08007a25 Thumb Code 188 modbus_rtu.o(i.writesinglecoil_rtu) - writesinglereg_rtu 0x08007ae9 Thumb Code 176 modbus_rtu.o(i.writesinglereg_rtu) - __aeabi_dadd 0x08007ba1 Thumb Code 0 daddsub_clz.o(x$fpl$dadd) - _dadd 0x08007ba1 Thumb Code 332 daddsub_clz.o(x$fpl$dadd) - __aeabi_ddiv 0x08007cf1 Thumb Code 0 ddiv.o(x$fpl$ddiv) - _ddiv 0x08007cf1 Thumb Code 552 ddiv.o(x$fpl$ddiv) - __aeabi_d2iz 0x08007fa1 Thumb Code 0 dfix.o(x$fpl$dfix) - _dfix 0x08007fa1 Thumb Code 94 dfix.o(x$fpl$dfix) - __aeabi_d2uiz 0x08008001 Thumb Code 0 dfixu.o(x$fpl$dfixu) - _dfixu 0x08008001 Thumb Code 90 dfixu.o(x$fpl$dfixu) - __aeabi_i2d 0x0800805b Thumb Code 0 dflt_clz.o(x$fpl$dflt) - _dflt 0x0800805b Thumb Code 46 dflt_clz.o(x$fpl$dflt) - __aeabi_l2d 0x08008089 Thumb Code 0 dfltll_clz.o(x$fpl$dfltll) - _ll_sto_d 0x08008089 Thumb Code 162 dfltll_clz.o(x$fpl$dfltll) - __aeabi_dmul 0x0800812d Thumb Code 0 dmul.o(x$fpl$dmul) - _dmul 0x0800812d Thumb Code 332 dmul.o(x$fpl$dmul) - __fpl_dnaninf 0x08008281 Thumb Code 156 dnaninf.o(x$fpl$dnaninf) - __fpl_dretinf 0x0800831d Thumb Code 12 dretinf.o(x$fpl$dretinf) - __aeabi_dsub 0x08008329 Thumb Code 0 daddsub_clz.o(x$fpl$dsub) - _dsub 0x08008329 Thumb Code 464 daddsub_clz.o(x$fpl$dsub) - _fp_init 0x080084fd Thumb Code 10 fpinit.o(x$fpl$fpinit) - __fplib_config_fpu_vfp 0x08008505 Thumb Code 0 fpinit.o(x$fpl$fpinit) - __fplib_config_pureend_doubles 0x08008505 Thumb Code 0 fpinit.o(x$fpl$fpinit) - __I$use$fp 0x08008506 Number 0 usenofp.o(x$fpl$usenofp) - AHBPrescTable 0x0800850e Data 16 system_stm32f4xx.o(.constdata) - APBPrescTable 0x0800851e Data 8 system_stm32f4xx.o(.constdata) - Region$$Table$$Base 0x08008528 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x08008548 Number 0 anon$$obj.o(Region$$Table) + main 0x08005dbd Thumb Code 130 main.o(i.main) + mf5803_loop 0x08005e45 Thumb Code 376 mf5803.o(i.mf5803_loop) + mf5803_setup 0x08005fed Thumb Code 184 mf5803.o(i.mf5803_setup) + modbus_analysis_rtu 0x080060ad Thumb Code 180 modbus_rtu.o(i.modbus_analysis_rtu) + modbus_errfunction_rtu 0x08006161 Thumb Code 118 modbus_rtu.o(i.modbus_errfunction_rtu) + modbus_process_rtu 0x080061e1 Thumb Code 64 modbus_rtu.o(i.modbus_process_rtu) + modbus_rtu_init 0x08006225 Thumb Code 58 modbus_rtu.o(i.modbus_rtu_init) + modbus_rx_cb 0x08006279 Thumb Code 98 modbus_rtu.o(i.modbus_rx_cb) + prov_adj_init 0x080062fd Thumb Code 80 provalctrl.o(i.prov_adj_init) + prov_adj_section 0x08006355 Thumb Code 600 provalctrl.o(i.prov_adj_section) + prov_adj_section_init 0x080065dd Thumb Code 64 provalctrl.o(i.prov_adj_section_init) + prov_calibrate_pid 0x08006621 Thumb Code 944 provalctrl.o(i.prov_calibrate_pid) + prov_ctrl 0x080069ed Thumb Code 108 provalctrl.o(i.prov_ctrl) + prov_init 0x08006a61 Thumb Code 634 provalctrl.o(i.prov_init) + prov_section_calculate 0x08006d01 Thumb Code 218 provalctrl.o(i.prov_section_calculate) + prov_set 0x08006de1 Thumb Code 472 provalctrl.o(i.prov_set) + readcoilstate_rtu 0x08006fcd Thumb Code 326 modbus_rtu.o(i.readcoilstate_rtu) + readdisinputstate_rtu 0x0800711d Thumb Code 322 modbus_rtu.o(i.readdisinputstate_rtu) + readholdreg_rtu 0x08007269 Thumb Code 258 modbus_rtu.o(i.readholdreg_rtu) + readinputreg_rtu 0x08007375 Thumb Code 252 modbus_rtu.o(i.readinputreg_rtu) + setcs 0x08007479 Thumb Code 86 ms5803.o(i.setcs) + tim6_cnt 0x080074e1 Thumb Code 420 timer.o(i.tim6_cnt) + uart_send 0x080076ed Thumb Code 20 uarts.o(i.uart_send) + wf5803_ReadReg 0x08007701 Thumb Code 34 mf5803.o(i.wf5803_ReadReg) + wf5803_WriteReg 0x08007723 Thumb Code 34 mf5803.o(i.wf5803_WriteReg) + writemulticoil_rtu 0x08007745 Thumb Code 322 modbus_rtu.o(i.writemulticoil_rtu) + writemultireg_rtu 0x08007891 Thumb Code 252 modbus_rtu.o(i.writemultireg_rtu) + writesinglecoil_rtu 0x08007995 Thumb Code 188 modbus_rtu.o(i.writesinglecoil_rtu) + writesinglereg_rtu 0x08007a59 Thumb Code 176 modbus_rtu.o(i.writesinglereg_rtu) + __aeabi_dadd 0x08007b11 Thumb Code 0 daddsub_clz.o(x$fpl$dadd) + _dadd 0x08007b11 Thumb Code 332 daddsub_clz.o(x$fpl$dadd) + __aeabi_ddiv 0x08007c61 Thumb Code 0 ddiv.o(x$fpl$ddiv) + _ddiv 0x08007c61 Thumb Code 552 ddiv.o(x$fpl$ddiv) + __aeabi_d2iz 0x08007f11 Thumb Code 0 dfix.o(x$fpl$dfix) + _dfix 0x08007f11 Thumb Code 94 dfix.o(x$fpl$dfix) + __aeabi_d2uiz 0x08007f71 Thumb Code 0 dfixu.o(x$fpl$dfixu) + _dfixu 0x08007f71 Thumb Code 90 dfixu.o(x$fpl$dfixu) + __aeabi_i2d 0x08007fcb Thumb Code 0 dflt_clz.o(x$fpl$dflt) + _dflt 0x08007fcb Thumb Code 46 dflt_clz.o(x$fpl$dflt) + __aeabi_l2d 0x08007ff9 Thumb Code 0 dfltll_clz.o(x$fpl$dfltll) + _ll_sto_d 0x08007ff9 Thumb Code 162 dfltll_clz.o(x$fpl$dfltll) + __aeabi_dmul 0x0800809d Thumb Code 0 dmul.o(x$fpl$dmul) + _dmul 0x0800809d Thumb Code 332 dmul.o(x$fpl$dmul) + __fpl_dnaninf 0x080081f1 Thumb Code 156 dnaninf.o(x$fpl$dnaninf) + __fpl_dretinf 0x0800828d Thumb Code 12 dretinf.o(x$fpl$dretinf) + __aeabi_dsub 0x08008299 Thumb Code 0 daddsub_clz.o(x$fpl$dsub) + _dsub 0x08008299 Thumb Code 464 daddsub_clz.o(x$fpl$dsub) + _fp_init 0x0800846d Thumb Code 10 fpinit.o(x$fpl$fpinit) + __fplib_config_fpu_vfp 0x08008475 Thumb Code 0 fpinit.o(x$fpl$fpinit) + __fplib_config_pureend_doubles 0x08008475 Thumb Code 0 fpinit.o(x$fpl$fpinit) + __I$use$fp 0x08008476 Number 0 usenofp.o(x$fpl$usenofp) + AHBPrescTable 0x0800847e Data 16 system_stm32f4xx.o(.constdata) + APBPrescTable 0x0800848e Data 8 system_stm32f4xx.o(.constdata) + Region$$Table$$Base 0x08008498 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x080084b8 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) @@ -3819,9 +3816,9 @@ Memory Map of the image Image Entry point : 0x08000189 - Load Region LR_IROM1 (Base: 0x08000000, Size: 0x000086e8, Max: 0x00100000, ABSOLUTE, COMPRESSED[0x00008568]) + Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00008658, Max: 0x00100000, ABSOLUTE, COMPRESSED[0x000084d8]) - Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00008548, Max: 0x00100000, ABSOLUTE) + Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000084b8, Max: 0x00100000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -4096,56 +4093,56 @@ Memory Map of the image 0x08005d3c 0x08005d3c 0x00000024 Code RO 4640 i.i2c_stop eeprom.o 0x08005d60 0x08005d60 0x00000038 Code RO 4641 i.i2c_waitack eeprom.o 0x08005d98 0x08005d98 0x00000024 Code RO 5833 i.led_ctrl gpios.o - 0x08005dbc 0x08005dbc 0x00000090 Code RO 18 i.main main.o - 0x08005e4c 0x08005e4c 0x000001a8 Code RO 4968 i.mf5803_loop mf5803.o - 0x08005ff4 0x08005ff4 0x000000c0 Code RO 4969 i.mf5803_setup mf5803.o - 0x080060b4 0x080060b4 0x000000b4 Code RO 5108 i.modbus_analysis_rtu modbus_rtu.o - 0x08006168 0x08006168 0x00000080 Code RO 5109 i.modbus_errfunction_rtu modbus_rtu.o - 0x080061e8 0x080061e8 0x00000044 Code RO 5110 i.modbus_process_rtu modbus_rtu.o - 0x0800622c 0x0800622c 0x00000054 Code RO 5111 i.modbus_rtu_init modbus_rtu.o - 0x08006280 0x08006280 0x00000084 Code RO 5112 i.modbus_rx_cb modbus_rtu.o - 0x08006304 0x08006304 0x000000b8 Code RO 5965 i.prov_adj_init provalctrl.o - 0x080063bc 0x080063bc 0x00000270 Code RO 5966 i.prov_adj_section provalctrl.o - 0x0800662c 0x0800662c 0x00000088 Code RO 5967 i.prov_adj_section_init provalctrl.o - 0x080066b4 0x080066b4 0x000003cc Code RO 5968 i.prov_calibrate_pid provalctrl.o - 0x08006a80 0x08006a80 0x00000070 Code RO 5969 i.prov_ctrl provalctrl.o - 0x08006af0 0x08006af0 0x000002a0 Code RO 5970 i.prov_init provalctrl.o - 0x08006d90 0x08006d90 0x000000e0 Code RO 5971 i.prov_section_calculate provalctrl.o - 0x08006e70 0x08006e70 0x000001ec Code RO 5972 i.prov_set provalctrl.o - 0x0800705c 0x0800705c 0x00000150 Code RO 5113 i.readcoilstate_rtu modbus_rtu.o - 0x080071ac 0x080071ac 0x0000014c Code RO 5114 i.readdisinputstate_rtu modbus_rtu.o - 0x080072f8 0x080072f8 0x0000010c Code RO 5115 i.readholdreg_rtu modbus_rtu.o - 0x08007404 0x08007404 0x00000104 Code RO 5116 i.readinputreg_rtu modbus_rtu.o - 0x08007508 0x08007508 0x00000068 Code RO 4749 i.setcs ms5803.o - 0x08007570 0x08007570 0x0000020c Code RO 5867 i.tim6_cnt timer.o - 0x0800777c 0x0800777c 0x00000014 Code RO 5910 i.uart_send uarts.o - 0x08007790 0x08007790 0x00000022 Code RO 4970 i.wf5803_ReadReg mf5803.o - 0x080077b2 0x080077b2 0x00000022 Code RO 4972 i.wf5803_WriteReg mf5803.o - 0x080077d4 0x080077d4 0x0000014c Code RO 5117 i.writemulticoil_rtu modbus_rtu.o - 0x08007920 0x08007920 0x00000104 Code RO 5118 i.writemultireg_rtu modbus_rtu.o - 0x08007a24 0x08007a24 0x000000c4 Code RO 5119 i.writesinglecoil_rtu modbus_rtu.o - 0x08007ae8 0x08007ae8 0x000000b8 Code RO 5120 i.writesinglereg_rtu modbus_rtu.o - 0x08007ba0 0x08007ba0 0x00000150 Code RO 6215 x$fpl$dadd fz_wm.l(daddsub_clz.o) - 0x08007cf0 0x08007cf0 0x000002b0 Code RO 6222 x$fpl$ddiv fz_wm.l(ddiv.o) - 0x08007fa0 0x08007fa0 0x0000005e Code RO 6225 x$fpl$dfix fz_wm.l(dfix.o) - 0x08007ffe 0x08007ffe 0x00000002 PAD - 0x08008000 0x08008000 0x0000005a Code RO 6233 x$fpl$dfixu fz_wm.l(dfixu.o) - 0x0800805a 0x0800805a 0x0000002e Code RO 6238 x$fpl$dflt fz_wm.l(dflt_clz.o) - 0x08008088 0x08008088 0x000000a2 Code RO 6243 x$fpl$dfltll fz_wm.l(dfltll_clz.o) - 0x0800812a 0x0800812a 0x00000002 PAD - 0x0800812c 0x0800812c 0x00000154 Code RO 6247 x$fpl$dmul fz_wm.l(dmul.o) - 0x08008280 0x08008280 0x0000009c Code RO 6279 x$fpl$dnaninf fz_wm.l(dnaninf.o) - 0x0800831c 0x0800831c 0x0000000c Code RO 6281 x$fpl$dretinf fz_wm.l(dretinf.o) - 0x08008328 0x08008328 0x000001d4 Code RO 6217 x$fpl$dsub fz_wm.l(daddsub_clz.o) - 0x080084fc 0x080084fc 0x0000000a Code RO 6450 x$fpl$fpinit fz_wm.l(fpinit.o) - 0x08008506 0x08008506 0x00000000 Code RO 6287 x$fpl$usenofp fz_wm.l(usenofp.o) - 0x08008506 0x08008506 0x00000008 Data RO 1572 .constdata stm32f4xx_hal_dma.o - 0x0800850e 0x0800850e 0x00000018 Data RO 4417 .constdata system_stm32f4xx.o - 0x08008526 0x08008526 0x00000002 PAD - 0x08008528 0x08008528 0x00000020 Data RO 6506 Region$$Table anon$$obj.o + 0x08005dbc 0x08005dbc 0x00000088 Code RO 18 i.main main.o + 0x08005e44 0x08005e44 0x000001a8 Code RO 4968 i.mf5803_loop mf5803.o + 0x08005fec 0x08005fec 0x000000c0 Code RO 4969 i.mf5803_setup mf5803.o + 0x080060ac 0x080060ac 0x000000b4 Code RO 5108 i.modbus_analysis_rtu modbus_rtu.o + 0x08006160 0x08006160 0x00000080 Code RO 5109 i.modbus_errfunction_rtu modbus_rtu.o + 0x080061e0 0x080061e0 0x00000044 Code RO 5110 i.modbus_process_rtu modbus_rtu.o + 0x08006224 0x08006224 0x00000054 Code RO 5111 i.modbus_rtu_init modbus_rtu.o + 0x08006278 0x08006278 0x00000084 Code RO 5112 i.modbus_rx_cb modbus_rtu.o + 0x080062fc 0x080062fc 0x00000058 Code RO 5965 i.prov_adj_init provalctrl.o + 0x08006354 0x08006354 0x00000288 Code RO 5966 i.prov_adj_section provalctrl.o + 0x080065dc 0x080065dc 0x00000044 Code RO 5967 i.prov_adj_section_init provalctrl.o + 0x08006620 0x08006620 0x000003cc Code RO 5968 i.prov_calibrate_pid provalctrl.o + 0x080069ec 0x080069ec 0x00000074 Code RO 5969 i.prov_ctrl provalctrl.o + 0x08006a60 0x08006a60 0x000002a0 Code RO 5970 i.prov_init provalctrl.o + 0x08006d00 0x08006d00 0x000000e0 Code RO 5971 i.prov_section_calculate provalctrl.o + 0x08006de0 0x08006de0 0x000001ec Code RO 5972 i.prov_set provalctrl.o + 0x08006fcc 0x08006fcc 0x00000150 Code RO 5113 i.readcoilstate_rtu modbus_rtu.o + 0x0800711c 0x0800711c 0x0000014c Code RO 5114 i.readdisinputstate_rtu modbus_rtu.o + 0x08007268 0x08007268 0x0000010c Code RO 5115 i.readholdreg_rtu modbus_rtu.o + 0x08007374 0x08007374 0x00000104 Code RO 5116 i.readinputreg_rtu modbus_rtu.o + 0x08007478 0x08007478 0x00000068 Code RO 4749 i.setcs ms5803.o + 0x080074e0 0x080074e0 0x0000020c Code RO 5867 i.tim6_cnt timer.o + 0x080076ec 0x080076ec 0x00000014 Code RO 5910 i.uart_send uarts.o + 0x08007700 0x08007700 0x00000022 Code RO 4970 i.wf5803_ReadReg mf5803.o + 0x08007722 0x08007722 0x00000022 Code RO 4972 i.wf5803_WriteReg mf5803.o + 0x08007744 0x08007744 0x0000014c Code RO 5117 i.writemulticoil_rtu modbus_rtu.o + 0x08007890 0x08007890 0x00000104 Code RO 5118 i.writemultireg_rtu modbus_rtu.o + 0x08007994 0x08007994 0x000000c4 Code RO 5119 i.writesinglecoil_rtu modbus_rtu.o + 0x08007a58 0x08007a58 0x000000b8 Code RO 5120 i.writesinglereg_rtu modbus_rtu.o + 0x08007b10 0x08007b10 0x00000150 Code RO 6215 x$fpl$dadd fz_wm.l(daddsub_clz.o) + 0x08007c60 0x08007c60 0x000002b0 Code RO 6222 x$fpl$ddiv fz_wm.l(ddiv.o) + 0x08007f10 0x08007f10 0x0000005e Code RO 6225 x$fpl$dfix fz_wm.l(dfix.o) + 0x08007f6e 0x08007f6e 0x00000002 PAD + 0x08007f70 0x08007f70 0x0000005a Code RO 6233 x$fpl$dfixu fz_wm.l(dfixu.o) + 0x08007fca 0x08007fca 0x0000002e Code RO 6238 x$fpl$dflt fz_wm.l(dflt_clz.o) + 0x08007ff8 0x08007ff8 0x000000a2 Code RO 6243 x$fpl$dfltll fz_wm.l(dfltll_clz.o) + 0x0800809a 0x0800809a 0x00000002 PAD + 0x0800809c 0x0800809c 0x00000154 Code RO 6247 x$fpl$dmul fz_wm.l(dmul.o) + 0x080081f0 0x080081f0 0x0000009c Code RO 6279 x$fpl$dnaninf fz_wm.l(dnaninf.o) + 0x0800828c 0x0800828c 0x0000000c Code RO 6281 x$fpl$dretinf fz_wm.l(dretinf.o) + 0x08008298 0x08008298 0x000001d4 Code RO 6217 x$fpl$dsub fz_wm.l(daddsub_clz.o) + 0x0800846c 0x0800846c 0x0000000a Code RO 6450 x$fpl$fpinit fz_wm.l(fpinit.o) + 0x08008476 0x08008476 0x00000000 Code RO 6287 x$fpl$usenofp fz_wm.l(usenofp.o) + 0x08008476 0x08008476 0x00000008 Data RO 1572 .constdata stm32f4xx_hal_dma.o + 0x0800847e 0x0800847e 0x00000018 Data RO 4417 .constdata system_stm32f4xx.o + 0x08008496 0x08008496 0x00000002 PAD + 0x08008498 0x08008498 0x00000020 Data RO 6506 Region$$Table anon$$obj.o - Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08008548, Size: 0x00001c80, Max: 0x0001c000, ABSOLUTE, COMPRESSED[0x00000020]) + Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x080084b8, Size: 0x00001c80, Max: 0x0001c000, ABSOLUTE, COMPRESSED[0x00000020]) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -4186,7 +4183,7 @@ Memory Map of the image 0x20001880 - 0x00000400 Zero RW 1 STACK startup_stm32f407xx.o - Execution Region RW_IRAM2 (Exec base: 0x2001c000, Load base: 0x08008568, Size: 0x00000000, Max: 0x00004000, ABSOLUTE) + Execution Region RW_IRAM2 (Exec base: 0x2001c000, Load base: 0x080084d8, Size: 0x00000000, Max: 0x00004000, ABSOLUTE) **** No section assigned to this execution region **** @@ -4212,12 +4209,12 @@ Image component sizes 152 12 0 0 0 1213 hc165.o 152 16 0 0 0 1206 hc595.o 196 26 0 0 84 1849 i2c.o - 450 22 0 0 0 724935 main.o + 442 22 0 0 0 724927 main.o 968 70 0 25 480 5526 mf5803.o 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 - 4244 264 0 42 632 16315 provalctrl.o + 4108 244 0 42 632 16283 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 @@ -4240,7 +4237,7 @@ Image component sizes 1288 114 0 0 840 5222 usart.o ---------------------------------------------------------------------- - 30296 2052 458 416 6784 952042 Object Totals + 30152 2032 458 416 6784 952002 Object Totals 0 0 32 0 0 0 (incl. Generated) 32 0 2 12 3 0 (incl. Padding) @@ -4305,15 +4302,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 33662 2244 458 416 6880 931890 Grand Totals - 33662 2244 458 32 6880 931890 ELF Image Totals (compressed) - 33662 2244 458 32 0 0 ROM Totals + 33518 2224 458 416 6880 931850 Grand Totals + 33518 2224 458 32 6880 931850 ELF Image Totals (compressed) + 33518 2224 458 32 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 34120 ( 33.32kB) + Total RO Size (Code + RO Data) 33976 ( 33.18kB) Total RW Size (RW Data + ZI Data) 7296 ( 7.13kB) - Total ROM Size (Code + RO Data + RW Data) 34152 ( 33.35kB) + Total ROM Size (Code + RO Data + RW Data) 34008 ( 33.21kB) ============================================================================== diff --git a/MDK-ARM/VOQC/VOQC_VOQC.dep b/MDK-ARM/VOQC/VOQC_VOQC.dep index bfbb2a9..91311f1 100644 --- a/MDK-ARM/VOQC/VOQC_VOQC.dep +++ b/MDK-ARM/VOQC/VOQC_VOQC.dep @@ -1,7 +1,7 @@ Dependencies for Project 'VOQC', Target 'VOQC': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARM Compiler_5_06 F (startup_stm32f407xx.s)(0x66C2E5B4)(--cpu Cortex-M4.fp.sp -g --apcs=interwork -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 --pd "__UVISION_VERSION SETA 539" --pd "_RTE_ SETA 1" --pd "STM32F407xx SETA 1" --pd "_RTE_ SETA 1" --list startup_stm32f407xx.lst --xref -o voqc\startup_stm32f407xx.o --depend voqc\startup_stm32f407xx.d) -F (../Core/Src/main.c)(0x66E24B95)(--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\main.o --omf_browse voqc\main.crf --depend voqc\main.d) +F (../Core/Src/main.c)(0x66EA684F)(--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\main.o --omf_browse voqc\main.crf --depend voqc\main.d) I (../Core/Inc/main.h)(0x6694D721) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC) I (../Core/Inc/stm32f4xx_hal_conf.h)(0x66C2E5B0) @@ -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)(0x66E255E4) +I (../users/Inc/provalctrl.h)(0x66EA684F) 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)(0x66E255E4) +I (../users/Inc/provalctrl.h)(0x66EA684F) I (../board/Inc/dac7311.h)(0x66949B65) I (../board/Inc/eeprom.h)(0x66CE9587) I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\math.h)(0x5E8E3CC2) @@ -2243,8 +2243,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)(0x66E2561E)(--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)(0x66E255E4) +F (..\users\Src\provalctrl.c)(0x66EA684F)(--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)(0x66EA684F) I (../modbus/Inc/modbus.h)(0x66CEC5B0) I (../users/Inc/timer.h)(0x66E24B97) I (../Core/Inc/tim.h)(0x6694D67D) diff --git a/MDK-ARM/VOQC/ads1220.crf b/MDK-ARM/VOQC/ads1220.crf index 33e78dc..db7fc3a 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 8875843..b362b3b 100644 Binary files a/MDK-ARM/VOQC/ads1220.o and b/MDK-ARM/VOQC/ads1220.o differ diff --git a/MDK-ARM/VOQC/main.crf b/MDK-ARM/VOQC/main.crf index 0e9ffe8..1294cdd 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 1793558..c7c1f78 100644 Binary files a/MDK-ARM/VOQC/main.o and b/MDK-ARM/VOQC/main.o differ diff --git a/MDK-ARM/VOQC/provalctrl.crf b/MDK-ARM/VOQC/provalctrl.crf index 637d630..db6d377 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 5f74670..186051a 100644 Binary files a/MDK-ARM/VOQC/provalctrl.o and b/MDK-ARM/VOQC/provalctrl.o differ diff --git a/users/Inc/provalctrl.h b/users/Inc/provalctrl.h index 19f795b..e3def86 100644 --- a/users/Inc/provalctrl.h +++ b/users/Inc/provalctrl.h @@ -114,8 +114,8 @@ typedef struct void prov_init(void); -void prov_adj_init(void); -void prov_adj_section_init(void); +void prov_adj_init(prov_adjust *adj_pvx); +void prov_adj_section_init(prov_adjust *adj_pvx); void prov_set(float target_p, propotion_valve *pvx); void prov_ctrl(propotion_valve *pvx, prov_adjust *adj_pvx); void prov_calibrate_pid(propotion_valve *pvx); diff --git a/users/Src/provalctrl.c b/users/Src/provalctrl.c index cce9761..bd85eef 100644 --- a/users/Src/provalctrl.c +++ b/users/Src/provalctrl.c @@ -104,31 +104,19 @@ void prov_init(void) //涓嶅悓姣斾緥闃鐨勫垵濮嬪弬鏁颁笉涓鏍 prov_adjust adj_pv1; prov_adjust adj_pv2; -void prov_adj_init(void) +void prov_adj_init(prov_adjust *adj_pvx) { - adj_pv1.adj_flag = 0; //鑷暣瀹氭爣蹇楋紝0锛氱┖闂诧紝1锛氭暣瀹氫腑 + adj_pvx->adj_flag = 0; //鑷暣瀹氭爣蹇楋紝0锛氱┖闂诧紝1锛氭暣瀹氫腑 for( uint8_t i = 0;i < OSCILL_TIMES;i++) //缁х數鏁村畾锛屾尟鑽″箙鍊,鎸崱鍛ㄦ湡 { - adj_pv1.relay_a[i] = 0; - adj_pv1.relay_tc[i] = 0; + adj_pvx->relay_a[i] = 0; + adj_pvx->relay_tc[i] = 0; } - adj_pv1.relay_d = 0.15; //缁х數鏁村畾锛屽洖鐜箙鍊 - adj_pv1.air_source = 0; //姘旀簮锛屽崟浣岾pa - adj_pv1.middle_current = 0; //涓棿姘斿帇鐢垫祦 - adj_pv1.oscil_times = 0; //鎸崱娆℃暟 - -/*****************************************************/ - - adj_pv2.adj_flag = 0; //鑷暣瀹氭爣蹇楋紝0锛氱┖闂诧紝1锛氭暣瀹氫腑 - for( uint8_t i = 0;i < OSCILL_TIMES;i++) //缁х數鏁村畾锛屾尟鑽″箙鍊,鎸崱鍛ㄦ湡 - { - adj_pv2.relay_a[i] = 0; - adj_pv2.relay_tc[i] = 0; - } - adj_pv2.relay_d = 0.15; //缁х數鏁村畾锛屽洖鐜箙鍊 - adj_pv2.air_source = 0; //姘旀簮锛屽崟浣岾pa - adj_pv2.middle_current = 0; //涓棿姘斿帇鐢垫祦 - adj_pv2.oscil_times = 0; //鎸崱娆℃暟 + adj_pvx->relay_d = 0.15; //缁х數鏁村畾锛屽洖鐜箙鍊 + adj_pvx->air_source = 0; //姘旀簮锛屽崟浣岾pa + adj_pvx->middle_current = 0; //涓棿姘斿帇鐢垫祦 + adj_pvx->oscil_times = 0; //鎸崱娆℃暟 + } float out_makeup = 0.05; @@ -441,7 +429,7 @@ void prov_ctrl(propotion_valve *pvx, prov_adjust *adj_pvx) if(adj_pvx->adj_flag == 1) //杩涘叆姝ゅ璇存槑鏁村畾琚墦鏂 { //鏁村畾缁撴潫 - prov_adj_init(); + prov_adj_init(adj_pvx); astep = ADJ_WAIT; } @@ -455,7 +443,7 @@ void prov_ctrl(propotion_valve *pvx, prov_adjust *adj_pvx) // //缁х數鍙嶉 // if(astep == ADJ_WAIT) // { -// prov_adj_init(); +// prov_adj_init(adj_pvx); // adj_pvx->adj_flag = 1; //鏁村畾寮濮 // astep = ADJ_START; // } @@ -464,7 +452,7 @@ void prov_ctrl(propotion_valve *pvx, prov_adjust *adj_pvx) //鍒嗘 if(astep_s == SECTION_WAIT) { - prov_adj_section_init(); + prov_adj_section_init(adj_pvx); adj_pvx->adj_flag = 1; //鏁村畾寮濮 astep_s = SECTION_START; } @@ -477,7 +465,7 @@ void prov_ctrl(propotion_valve *pvx, prov_adjust *adj_pvx) if(adj_pvx->adj_flag == 1) //杩涘叆姝ゅ璇存槑鏁村畾琚墦鏂 { //鏁村畾缁撴潫 - prov_adj_init(); + prov_adj_init(adj_pvx); astep = ADJ_WAIT; } } @@ -710,7 +698,7 @@ void prov_adj(propotion_valve *pvx, prov_adjust *adj_pvx) tick_previous = -1; tick_current = -1; - prov_adj_init(); + prov_adj_init(adj_pvx); pvx->status = PROV_RUNNING; //鎭㈠鎺у埗 astep++; @@ -735,22 +723,16 @@ void prov_adj(propotion_valve *pvx, prov_adjust *adj_pvx) } } -void prov_adj_section_init(void) +void prov_adj_section_init(prov_adjust *adj_pvx) { - adj_pv1.adj_flag = 0; - adj_pv1.stable_area = 9; - adj_pv1.wait_tick = 10; - - adj_pv2.adj_flag = 0; - adj_pv2.stable_area = 9; - adj_pv2.wait_tick = 10; + adj_pvx->adj_flag = 0; + adj_pvx->stable_area = 9; + adj_pvx->wait_tick = 10; for(uint8_t i = 0; i < SECTION_NUM; i++) { - adj_pv1.table_current[i] = 0; - adj_pv1.table_pressure[i] = 0; - adj_pv2.table_current[i] = 0; - adj_pv2.table_pressure[i] = 0; + adj_pvx->table_current[i] = 0; + adj_pvx->table_pressure[i] = 0; } } @@ -838,12 +820,14 @@ void prov_adj_section(propotion_valve *pvx, prov_adjust *adj_pvx) case 1: { ao_blf1 = 0; + CoilState[3] &= 0xBF; //D6 = 0, [1011 1111] } break; case 2: { ao_blf2 = 0; + CoilState[3] &= 0xDF; //D5 = 0, [1101 1111] } break; default: @@ -857,7 +841,7 @@ void prov_adj_section(propotion_valve *pvx, prov_adjust *adj_pvx) adj_pvx->adj_flag = 0; pvx->status = PROV_HOLDING; //鎭㈠鎺у埗 - astep++; + astep_s++; }else if( (tick_current - tick_previous) < 0) { tick_previous = -1;