diff --git a/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.c b/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.c index afd83c2..0a1748b 100644 --- a/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.c +++ b/f103c8t6_keil/MDK-ARM/MYDEIVERS/mymain.c @@ -33,10 +33,22 @@ int test_code=0; menu menu_main= { + 0,0, "Back\nInput mode\nBuzzer\nDisplay\nLanguage\nAbout", "返回\n输入模式\n蜂鸣器\n显示\n语言\n关于", + NULL + + +}; + +menu buzzer_setting= +{ + 0,0, + "Back\nInput", + "返回\n输入", + "no\noff" + - 0,0 }; void di() @@ -133,6 +145,14 @@ void mymain() case 3: //buzzer setting + switch(SHOW_MENU(&buzzer_setting,encode_c,B1.code,sys_lan)) + { + case 0: + //jump to main GUI + mode=1; + break; + + } if(HAL_GetTick()>jump_tick){mode=1;} break; diff --git a/f103c8t6_keil/MDK-ARM/MYDEIVERS/oled.h b/f103c8t6_keil/MDK-ARM/MYDEIVERS/oled.h index 5bd4b73..96a2877 100644 --- a/f103c8t6_keil/MDK-ARM/MYDEIVERS/oled.h +++ b/f103c8t6_keil/MDK-ARM/MYDEIVERS/oled.h @@ -20,10 +20,12 @@ typedef struct { - const char *list_en; - const char *list_ch; int sele; int list_dis_top; + const char *list_en; + const char *list_ch; + char *r_list; + }menu; diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvguix.kevin b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvguix.kevin index b3c6e10..a8f46c5 100644 --- a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvguix.kevin +++ b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvguix.kevin @@ -111,7 +111,7 @@ 0 1574 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D000000060000000100000052433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6D796D61696E2E6300000000086D796D61696E2E6300000000C5D4F200FFFFFFFF52433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C62757A7A65722E63000000000862757A7A65722E6300000000FFDC7800FFFFFFFF50433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6F6C65642E6300000000066F6C65642E6300000000BECEA100FFFFFFFF50433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6F6C65642E6800000000066F6C65642E6800000000F0A0A100FFFFFFFF52433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C656E636F64652E630000000008656E636F64652E6300000000BCA8E100FFFFFFFF52433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C656E636F64652E680000000008656E636F64652E68000000009CC1B600FFFFFFFF52433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6D796D61696E2E6800000000086D796D61696E2E6800000000F7B88600FFFFFFFF51433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C666F6E74732E630000000007666F6E74732E6300000000D9ADC200FFFFFFFF47433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000A5C2D700FFFFFFFF47433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C436F72655C496E635C6D61696E2E6800000000066D61696E2E6800000000B3A6BE00FFFFFFFF5B433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C68726561645F696E746572666163652E63000000001168726561645F696E746572666163652E6300000000EAD6A300FFFFFFFF5B433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C68726561645F696E746572666163652E68000000001168726561645F696E746572666163652E6800000000F6FA7D00FFFFFFFF51433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6D6F7273722E6300000000076D6F7273722E6300000000B5E99D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000003F0600002FFFFFFFD60C00005E020000 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D000000020000000100000052433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6D796D61696E2E6300000000086D796D61696E2E6300000000C5D4F200FFFFFFFF52433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C62757A7A65722E63000000000862757A7A65722E6300000000FFDC7800FFFFFFFF50433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6F6C65642E6300000000066F6C65642E6300000000BECEA100FFFFFFFF50433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6F6C65642E6800000000066F6C65642E6800000000F0A0A100FFFFFFFF52433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C656E636F64652E630000000008656E636F64652E6300000000BCA8E100FFFFFFFF52433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C656E636F64652E680000000008656E636F64652E68000000009CC1B600FFFFFFFF52433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6D796D61696E2E6800000000086D796D61696E2E6800000000F7B88600FFFFFFFF51433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C666F6E74732E630000000007666F6E74732E6300000000D9ADC200FFFFFFFF47433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C436F72655C5372635C6D61696E2E6300000000066D61696E2E6300000000A5C2D700FFFFFFFF47433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C436F72655C496E635C6D61696E2E6800000000066D61696E2E6800000000B3A6BE00FFFFFFFF5B433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C68726561645F696E746572666163652E63000000001168726561645F696E746572666163652E6300000000EAD6A300FFFFFFFF5B433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C68726561645F696E746572666163652E68000000001168726561645F696E746572666163652E6800000000F6FA7D00FFFFFFFF51433A5C55736572735C6B6576696E5C4465736B746F705C6D6F7273655F636F64655F747261696E65725C66313033633874365F6B65696C5C4D444B2D41524D5C4D59444549564552535C6D6F7273722E6300000000076D6F7273722E6300000000B5E99D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000003F0600002FFFFFFFD60C00005E020000 @@ -1806,7 +1806,7 @@ File 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000000000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 986 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000D66313033633874365F4B45494C960000000000000001000D66313033633874365F4B45494C000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000D66313033633874365F4B45494C960000000000000001000D66313033633874365F4B45494C000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1862,12 +1862,12 @@ 0 100 - 6 + 2 .\MYDEIVERS\mymain.c - 4 - 1 - 34 + 0 + 121 + 154 1 0 @@ -1883,16 +1883,16 @@ .\MYDEIVERS\oled.c - 13 - 1107 - 1108 + 8 + 1151 + 1183 1 0 ./MYDEIVERS/oled.h - 6 + 15 1 27 1 diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvoptx b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvoptx index f13bfe4..6dde270 100644 --- a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvoptx +++ b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL.uvoptx @@ -183,7 +183,7 @@ Application/MDK-ARM - 1 + 0 0 0 0 @@ -203,7 +203,7 @@ Application/User/Core - 1 + 0 0 0 0 @@ -247,7 +247,7 @@ Drivers/STM32F1xx_HAL_Driver - 1 + 0 0 0 0 @@ -423,7 +423,7 @@ Drivers/CMSIS - 1 + 0 0 0 0 @@ -463,7 +463,7 @@ 5 21 1 - 1 + 0 0 0 .\MYDEIVERS\mymain.c diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf index 53f0391..898d601 100644 Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.axf differ diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm index 5c16cbb..b4649c8 100644 --- a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm +++ b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.build_log.htm @@ -27,62 +27,7 @@ Project File Date: 05/05/2022

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' Build target 'f103c8t6_KEIL' -compiling mymain.c... -MYDEIVERS\oled.h(33): warning: #1295-D: Deprecated declaration OLED_Cache_to_hardware - give arg types - void OLED_Cache_to_hardware(); -MYDEIVERS\buzzer.h(27): warning: #1295-D: Deprecated declaration BUZZER_PLAY_INIT - give arg types - void BUZZER_PLAY_INIT(); -MYDEIVERS\buzzer.h(29): warning: #1295-D: Deprecated declaration BUZZER_PLAY_SERVER - give arg types - void BUZZER_PLAY_SERVER(); -MYDEIVERS\morsr.h(20): warning: #1295-D: Deprecated declaration mo_server - give arg types - void mo_server(); -MYDEIVERS\morsr.h(21): warning: #1295-D: Deprecated declaration mo_di - give arg types - void mo_di(); -MYDEIVERS\morsr.h(22): warning: #1295-D: Deprecated declaration mo_da - give arg types - void mo_da(); -MYDEIVERS\morsr.h(25): warning: #1-D: last line of file ends without a newline - #endif /* MYMAIN_H_ */ -MYDEIVERS\mymain.h(22): warning: #1295-D: Deprecated declaration mymain - give arg types - void mymain(); -MYDEIVERS\mymain.c(58): warning: #188-D: enumerated type mixed with another type - PWR_EN(1); -MYDEIVERS\mymain.c(67): warning: #188-D: enumerated type mixed with another type - MUTE(0); -MYDEIVERS\mymain.c(105): warning: #223-D: function "sprintf" declared implicitly - sprintf(str,"FPS:%d",fps); -MYDEIVERS\mymain.c(232): warning: #1-D: last line of file ends without a newline - } -MYDEIVERS\mymain.c: 12 warnings, 0 errors -compiling oled.c... -MYDEIVERS\oled.h(33): warning: #1295-D: Deprecated declaration OLED_Cache_to_hardware - give arg types - void OLED_Cache_to_hardware(); -MYDEIVERS\oled.c(1036): warning: #550-D: variable "absx" was set but never used - int dx,dy,absx,absy; -MYDEIVERS\oled.c(1036): warning: #550-D: variable "absy" was set but never used - int dx,dy,absx,absy; -MYDEIVERS\oled.c: 3 warnings, 0 errors -compiling main.c... -./MYDEIVERS/oled.h(33): warning: #1295-D: Deprecated declaration OLED_Cache_to_hardware - give arg types - void OLED_Cache_to_hardware(); -./MYDEIVERS/buzzer.h(27): warning: #1295-D: Deprecated declaration BUZZER_PLAY_INIT - give arg types - void BUZZER_PLAY_INIT(); -./MYDEIVERS/buzzer.h(29): warning: #1295-D: Deprecated declaration BUZZER_PLAY_SERVER - give arg types - void BUZZER_PLAY_SERVER(); -./MYDEIVERS/morsr.h(20): warning: #1295-D: Deprecated declaration mo_server - give arg types - void mo_server(); -./MYDEIVERS/morsr.h(21): warning: #1295-D: Deprecated declaration mo_di - give arg types - void mo_di(); -./MYDEIVERS/morsr.h(22): warning: #1295-D: Deprecated declaration mo_da - give arg types - void mo_da(); -./MYDEIVERS/morsr.h(25): warning: #1-D: last line of file ends without a newline - #endif /* MYMAIN_H_ */ -./MYDEIVERS/mymain.h(22): warning: #1295-D: Deprecated declaration mymain - give arg types - void mymain(); -../Core/Src/main.c: 8 warnings, 0 errors -linking... -Program Size: Code=11148 RO-data=3928 RW-data=80 ZI-data=4144 -FromELF: creating hex file... -"f103c8t6_KEIL\f103c8t6_KEIL.axf" - 0 Error(s), 23 Warning(s). +"f103c8t6_KEIL\f103c8t6_KEIL.axf" - 0 Error(s), 0 Warning(s).

Software Packages used:

@@ -106,7 +51,7 @@ Package Vendor: Keil * Component: ARM::CMSIS:CORE:5.5.0 Include file: CMSIS\Core\Include\tz_context.h -Build Time Elapsed: 00:00:06 +Build Time Elapsed: 00:00:00 diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.hex b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.hex index 8ff95a0..be9f2b3 100644 --- a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.hex +++ b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.hex @@ -1,5 +1,5 @@ :020000040800F2 -:100000008010002099010008871E00089919000837 +:100000009810002099010008871E0008991900081F :10001000851E0008A50700084B2500080000000009 :100020000000000000000000000000009522000811 :10003000A70700080000000091210008972200088F @@ -17,7 +17,7 @@ :1000F00000F043F80AA090E8000C82448344AAF17F :100100000107DA4501D100F038F8AFF2090EBAE87C :100110000F0013F0010F18BFFB1A43F0010318473B -:10012000A4390000C4390000103A24BF78C878C14F +:10012000DC390000FC390000103A24BF78C878C1DF :10013000FAD8520724BF30C830C144BF04680C60ED :10014000704700000023002400250026103A28BF35 :1001500078C1FBD8520728BF30C148BF0B60704739 @@ -27,8 +27,8 @@ :10019000F2FF03BC00F070FA0948804709480047A5 :1001A000FEE7FEE7FEE7FEE7FEE7FEE7FEE7FEE727 :1001B000FEE7FEE704480549054A064B7047000084 -:1001C000F9220008ED000008800A002080100020BD -:1001D000800C0020800C002070B5064600F000F96D +:1001C000F9220008ED000008980A0020981000208D +:1001D000980C0020980C002070B5064600F000F93D :1001E000056806F10B0020F00704B4429CBF002014 :1001F00070BD2B466A68BAB11068A04210D304F1F2 :10020000080188423CBF5068586007D351681019F4 @@ -61,7 +61,7 @@ :1003B000A0E80C5048BF0CC05DF804EB890028BFD2 :1003C00040F8042B08BF704748BF20F8022B11F0FB :1003D000804F18BF00F8012B704770477047704777 -:1003E00000487047280A00207047704770477047E0 +:1003E00000487047400A00207047704770477047C8 :1003F00038B504460A4600206946AFF3008000285D :1004000008BF38BD02460099204600F0B7F8012029 :1004100038BD012000F0CCB8F8B5AFF30080054638 @@ -86,7 +86,7 @@ :10054000704700B58FB0CDE9013100210591054913 :100550007944CDE9031011466846FFF7A7FE0FB0B6 :1005600000BD0000E5FFFFFF0A6802F8010B0A600A -:100570007047000000487047200A0020034640688A +:100570007047000000487047380A00200346406872 :100580008C46002818BF88423CBF03464068F8D319 :1005900018681844884207D00CF1030020F00700C7 :1005A000001D411A521A0146081D0A60FFF743BE9A @@ -108,20 +108,20 @@ :1006A00000F009F814B120780028F8D1BDE87040B6 :1006B0000A20AFF3008008B569468DF800000320DA :1006C000ABBE08BD2DE9F0410C4E0446B6FBF4F07C -:1006D0007705401E0A46F8620949104602F0F2F812 -:1006E0000546B6FBF4F0401E02F0CEF9294602F0B2 -:1006F000F7F902F0A9F9F863BDE8F08100A24A0415 +:1006D0007705401E0A46F8620949104602F0FCF808 +:1006E0000546B6FBF4F0401E02F0D8F9294602F0A8 +:1006F00001FA02F0B3F9F863BDE8F08100A24A0400 :100700000000C842034800210160416001730846AF -:10071000FFF7D8BF7409002070B5064614460D4691 +:10071000FFF7D8BF8C09002070B5064614460D4679 :100720000C20FFF759FD00280AD0058184718680CE :100730000021016004490A681AB14A6810604860E3 -:1007400070BD0860FBE700007409002070B5144C10 +:1007400070BD0860FBE700008C09002070B5144CF8 :10075000207BC0070BD000F08FF9A16888421DD91B :1007600000202073BDE870400146FFF7ABBF206852 :10077000002813D00120207300F07EF92568298914 -:100780000844A060A8792E6802F096F90146A8886E +:100780000844A060A8792E6802F0A0F90146A88864 :10079000FFF798FF2068FFF74EFD266070BD000050 -:1007A00074090020FEE77047012000F057B80220CE +:1007A0008C090020FEE77047012000F057B80220B6 :1007B00000F054B8082000F051B8102000F04EB8F6 :1007C00070B5017000250446458009BB207990B9B9 :1007D00000F052F9A168012601F5FA71884203D2AE @@ -253,10 +253,10 @@ :100FB00006D56068296920F4605040EAC10060608D :100FC00000F028F86168084AC1F30311515CC84079 :100FD0000649086006480068FFF7F8FE0020C2E7EF -:100FE0000020024000100240782C00080C00002075 +:100FE00000200240001002408C2C00080C00002061 :100FF000040000200448054900684968044AC1F318 :101000000221515CC84070470C00002000100240D3 -:10101000882C000812A185B00FC98DE80F0014A01C +:101010009C2C000812A185B00FC98DE80F0014A008 :10102000144A006804905168134801F00C03042B23 :1010300010D0082B0ED1C1F38343C9031DF8030060 :101040000AD5516804AAC1F34041515C0A4A504391 @@ -449,7 +449,7 @@ :101BF00044F8300F20216173A073216941F0200166 :101C000021612073E2E700003EB564248DE81C00EA :101C10000A46014601230248FEF7F8FF3EBD0000D8 -:101C2000500000202DE9F04F85B000255248009566 +:101C2000680000202DE9F04F85B00025524800954E :101C3000019502950395816941F0100181618169E7 :101C400001F010010491816941F0200181618169F5 :101C500001F020010491816941F0040181618169F1 @@ -480,27 +480,27 @@ :101DE000FEE70B940BA90C480C94FFF7EFFA08B12F :101DF00072B6FEE76020CDE900040294082269462D :101E000005480494FFF7E5FC08B172B6FEE7024806 -:101E1000FFF7BAFC0EB010BDA400002010B586B0CC +:101E1000FFF7BAFC0EB010BDBC00002010B586B0B4 :101E200000241748009401940294039404941349E5 :101E3000059401604721C0E9011440F2E731C0E98F :101E400003148461FFF7F6FA08B172B6FEE74FF4A7 :101E50008050009069460A48FFF776FB08B172B6D9 :101E6000FEE7049404A906480594FFF7AFFA00289A :101E700001D072B6FEE706B010BD000000040040BD -:101E8000EC000020FEE7FEE73CB5A3F12005059C31 +:101E800004010020FEE7FEE73CB5A3F12005059C18 :101E90005E2D26D8082A0DD00C2A15D0102A20D164 :101EA000104A02EB0312A2F50072CDE900241023C0 :101EB000082214E00C4A02EBC302A2F58072CDE9BD :101EC0000024082305220AE003EB4302074B03EB3F :101ED0008202A2F5C072CDE900240C23062200F094 -:101EE00096F83CBDFC330008902C0008882F0008B1 +:101EE00096F83CBD10340008A42C00089C2F000874 :101EF0002DE9F05F4FF00008DFF85CA04546C146D1 :101F0000AAF5806B2946002000F0D3F800240AEBE4 :101F1000C5170BEBC516395D305D88420ED0B8F1A0 :101F2000000F05D14FF001082946204600F0C1F806 :101F3000305D00F007F9305D385501E04FF00008E2 :101F400006F80490641CE4B2802CE4D36D1CEDB25E -:101F5000082DD7D3BDE8F09F7405002010B5AE2042 +:101F5000082DD7D3BDE8F09F8C05002010B5AE202A :101F600000F0E8F8D52000F0E5F8502000F0E2F8A5 :101F7000A82000F0DFF83F2000F0DCF8D32000F0CC :101F8000D9F8002000F0D6F8402000F0D3F88D20DA @@ -535,23 +535,23 @@ :102150005BFD08BD10B5802816D2402914D2CC08EA :1021600001F007018023CB40084901EBC414215C36 :1021700022B1012A04D0022A05D103E0994302E0EA -:10218000194300E05940215410BD000074010020A3 +:10218000194300E05940215410BD00008C0100208B :1021900070472DE9FF4F0026044689B04FF0FF3904 -:1021A0003246304613B1012B70D101E0256807E0BB -:1021B000656805E00A2B01D1761CB6B2521C92B2BA -:1021C000AB5C002BF6D1A2689B465118A16002D5EA -:1021D0005946C4F808B0B14200DDA660D4E9022136 -:1021E000CB1C9A4201DA491EE1608A4204DDCA1C16 -:1021F000B24201DA491CE16006F10108B8F1040FAE -:1022000001D9E26800E000220021E26007E06D1CD5 +:1021A0003246304613B1012B70D101E0A56807E03B +:1021B000E56805E00A2B01D1761CB6B2521C92B23A +:1021C000AB5C002BF6D122689B465118216002D5EA +:1021D0005946C4F800B0B14200DD2660D4E90021C0 +:1021E000CB1C9A4201DA491E61608A4204DDCA1C96 +:1021F000B24201DA491C616006F10108B8F1040F2E +:1022000001D9626800E000220021626007E06D1CD5 :102210002B780BB10A2BFAD1491C89B26D1C8A426A -:10222000F6DC00270DF1040A23E0E168A2683944D6 +:10222000F6DC00270DF1040A23E0616822683944D6 :10223000914201D13E2200E020220AF800205246BD :10224000401C03E01154401C80B26D1C297809B178 :102250000A29F7D102F800B0012000903807010EDA :1022600001AB10220020FFF736FF7F1C0020BFB219 :102270006D1CB8F1040F01D9042100E0711CB942B2 -:10228000D3D80B98012801D1D4F808900DB0484656 +:10228000D3D80B98012801D1D4F800900DB048465E :10229000BDE8F08F7047FEF77FBD30B58FB02821C5 :1022A0006846FEF773F814210AA8FEF76FF80121BB :1022B0000804CDE900100024029402250491CDE920 @@ -559,8 +559,8 @@ :1022D00072B6FEE70F20CDE90A054FF48060CDE924 :1022E0000C4002210AA80E94FEF7EEFD002801D052 :1022F00072B6FEE70FB030BD704700000148FFF72F -:102300008FB90000A40000200148FFF789B9000040 -:10231000EC000020F0B50268164B174C174D4FF03B +:102300008FB90000BC0000200148FFF789B9000028 +:1023100004010020F0B50268164B174C174D4FF022 :102320008047984205D0B84203D0A04201D0A842CD :1023300003D122F070064A683243984205D0B84271 :1023400003D0A04201D0A84203D122F44074CA684D @@ -604,20 +604,20 @@ :1025A000FEF7BAF8BDE8104000F062B830B50B4B4A :1025B000002200BF02EB42041D5D854208D11C448D :1025C00064788C4204D102EB42001844807830BD1C -:1025D000521C262AEEDB202030BD0000EC3900081A +:1025D000521C262AEEDB202030BD0000003A000805 :1025E000FEF7E2FBFFF759FEFFF71CFB0E480D4913 :1025F0004FF4804201600D49416000218160C0E9D3 :10260000031241618161C1610162FEF73BFA08B1C9 :1026100072B6FEE7FFF7BAFBFFF700FC00F088F8A0 -:10262000FEE700000054004050000020A08601009A +:10262000FEE700000054004068000020A086010082 :1026300010B50D4C0D4B2D21227860780244995431 :102640008021C140A278401C1143C0B2A1706070CB :10265000082801D100206070FEF70EFA00F5E17045 -:10266000A0600120E07010BD40000020840900201F +:10266000A0600120E07010BD580000209C090020EF :1026700010B50B4C0B4B2E21227860780244401C85 :10268000C0B299546070082801D100206070FEF734 :10269000F3F900F5E170A0600120E07010BD0000CA -:1026A000400000208409002070B51F4C00251F4EFB +:1026A000580000209C09002070B51F4C00251F4ECB :1026B000E07801281FD1FEF7DFF9A16888421AD916 :1026C000E570217800200A18401CB5540828FADB70 :1026D000A1786078FFF76AFF21782028705405D030 @@ -625,327 +625,332 @@ :1026F00020706570A570207901280AD1FEF7BCF919 :10270000A168884205D92571207820213154401CC8 :1027100020702078932805D100203554401C932840 -:10272000FBDB257070BD0000400000208409002004 -:1027300008B55B4C012211022046FEF798F9FFF71D -:102740000DFC08215748FFF7D7F85748FEF7D0FE91 +:10272000FBDB257070BD0000580000209C090020D4 +:1027300008B5604C012211022046FEF798F9FFF718 +:102740000DFC08215C48FFF7D7F85C48FEF7D0FE87 :10275000FDF7D8FF002208212046FEF788F94FF444 -:102760007A7032220146FDF7D7FF504F0125504EB7 -:10277000504CBD7342F2107808213046FEF76AF9DA -:1027800001464A48FEF71CF84A481830FEF748F858 +:102760007A7032220146FDF7D7FF554F0125554EAD +:10277000554CBD7342F2107808213046FEF76AF9D5 +:1027800001464F48FEF71CF84F481830FEF748F84E :10279000606118B1FEF770F940442061A06800281C -:1027A00062D0012804D0022848D003285DD156E029 -:1027B00001213046FEF74EF901463C481030FDF746 -:1027C000FFFF02213046FEF745F901463748203029 -:1027D000FDF7F6FF6069002803DC344820304088AC -:1027E00008B1FFF7D3FE6069002803DB2F481030E3 -:1027F000408808B1FFF7BAFE00212F4B0822084697 -:102800000095FFF768FCA0882CA1401CA0802748F9 -:1028100062883030FDF736FD244B082230333821F2 -:1028200000200095FFF757FC7888FF281DD1022073 -:10283000A060FEF721F94044206116E01D48BA78F7 -:10284000237820306169FFF7A4FC20B1012806D06D -:10285000022804D101E0A56001E00320A060FEF79A -:102860000BF92169884200D9A560FFF71DFFFDF72C -:102870006DFFFFF73DFBFEF7FFF80146E068814280 -:102880007FF67AAF00F57A70E0604FF40041304691 -:10289000FEF7E5F8A08860800020A0806CE70000CB -:1028A00000080140A4000020EC00002034010020BA -:1028B000000C014010000020840900204650533ACB -:1028C000256400004FF47F0C1CEAD0121EBF1CEAE6 -:1028D000D11392EA0C0F93EA0C0F00F0858090EA76 -:1028E000010F48BF42F4807240F4000C41F4000034 -:1028F0002CF07F4120F07F4000B58142A2EB030223 -:102900000FF2081CACEB504EC0F100009EF800E046 -:102910004FEA4E0E00FB0EFC38BF49004FEA2C1C5C -:1029200002F5FA020CFB0EF34FEACE1E4FEA112C11 -:102930004FEAC1210EEB635E42EB22420EFB0CFC20 -:102940004FEA1C5300FB03114FEA112C4FEA0131EF -:102950000EFB0CFC4FEADC4C00FB0C11C14228BF03 -:1029600009184CEB03335DF804EB10EB410143EB2A -:10297000C250B2F57C0F38BF704729D512F0F00F66 -:102980001CBF00F1C04000F000407047008182830E -:102990008485868788898B8C8D8E8F91929395966E -:1029A00097999A9C9D9FA0A2A3A5A7A8AAACAEB0F8 -:1029B000B2B3B5B7B9BCBEC0C2C5C7C9CCCED1D4FD -:1029C000D7D9DCDFE2E6E9ECF0F3F7FAFE0000002D -:1029D0004FEA400C0CF1807CBCF17E4F28BF704761 -:1029E000B0F1C04000F043B990EA010F0CEAD113F6 -:1029F00048BF42F48072624538BF634507D213F482 -:102A00007F0F16D080EA010000F00040704710B53B -:102A100000F0E7F8097EFC3E00F005B880EA01000E -:102A200000F00040704780EA010000F0004000F034 -:102A30001EB912F47F0F04BF0248704780EA0100FC -:102A400000F015B90000C07FC10DD1F19E0206DB78 -:102A50004FEA002343F0004323FA02F0704700429C -:102A600007D54FEA4001B1F1FE4F02D24FF000000E -:102A7000704710B500F0B5F84992248000207047E7 -:102A80006FEA20007047000010F0004148BF40424C -:102A9000B0FA80F310FA03F2C3F19D030BD051EAB0 -:102AA000C35101EB1220530638BF704700F10100FB -:102AB00008BF20F001007047B0FA80F310FA03F26B -:102AC000C3F19D030AD0D90501EB1220530638BF8C -:102AD000704700F1010008BF20F0010070470000BE -:102AE0004FF47F0C1CEAD0121EBF1CEAD11392EAED -:102AF0000C0F93EA0C0F00F0478090EA010F48BFDB -:102B000042F480724FF0004C4CEA00204CEA012164 -:102B100002EB0302A0FB0113A2F50002002918BF7B -:102B200043F001035B0028BF4FEA330342EB22422C -:102B30005FEA132C4CEBC2502EBFBCEB436FB2F5D7 -:102B40007C0F70474FEA036CBCF1004F08BF20F0C8 -:102B50000100B2F57C0F38BF70470BD582F0FF0241 -:102B600012F5803FC8BF704700F1C040D8BF00F0E9 -:102B70000040704700F5000C5FEA4C0C48BF7047FE -:102B8000B0F1C04000F073B890EA010F0CEAD11325 -:102B900048BF42F48072624538BF634504D280EA80 -:102BA000010000F00040704710B500F01AF800BFB7 -:102BB0008900013E00F007B800F009B85FEA410C57 -:102BC0005FEA1C6C08D080EA010000F050B85FEAB0 -:102BD000400C5FEA1C6CF6D14FF00040A0F580007D -:102BE00070470EF1020E2EF0030E5EF8044B2442E5 -:102BF00004D44FEA4102B2F17F4F11D84FEA4003AB -:102C0000B3F17F4F0CD80ED14FEAD07CB2F17F4F99 -:102C10000CEB4C0C0CF1020C08BF4CEBD17C04E02B -:102C20004FF0080C01E04FEAD17C0CEB4C0324FA86 -:102C300003F404F00704B4F1040C06D20EEB840C88 -:102C4000BDE810404CF0010C6047DFE80CF00708CD -:102C500002024FF00040A0F5800010BD084642007F -:102C600018BFD2F1807288BF00F0004010BDFF2174 -:102C700041EAD050C005704700000000000000008D -:102C80000102030406070809000000000102030412 -:102C90000000000000000000202020202000200074 -:102CA00050505000000000005050F850F8505000B4 -:102CB0002078C07028F02000C0C81020409818006C -:102CC00040A0A040A8906800302040000000000014 -:102CD00010204040402010004020101010204000E4 -:102CE00020A8702070A82000202020F8202020009C -:102CF0000000000060408000000000F800000000BC -:102D0000000000000060600000081020408000000B -:102D1000708898A8C888700020602020202070004B -:102D2000708808304080F800F8081030088870007B -:102D300010305090F8101000F880F00808887000EB -:102D4000384080F088887000F8081020404040002B -:102D50007088887088887000708888780810E00013 -:102D600000606000606000000060600060608000E3 -:102D700010204080402010000000F800F800000003 -:102D800040201008102040007088102020002000F3 -:102D90007088B8A8B880780020508888F8888800A3 -:102DA000F08888F08888F0007088808080887000C3 -:102DB000F08888888888F000F88080F08080F800AB -:102DC000F88080F08080800070888080B8887800EB -:102DD000888888F88888880070202020202070004B -:102DE00038101010109060008890A0C0A09088004B -:102DF000808080808080F80088D8A8A88888880093 -:102E00008888C8A898888800708888888888700012 -:102E1000F08888F08080800070888888A89068009A -:102E2000F08888F0A0908800708880700888700012 -:102E3000F82020202020200088888888888870003A -:102E40008888888888502000888888A8A8D8880022 -:102E500088885020508888008888502020202000B2 -:102E6000F80810204080F800F0C0C0C0C0C0F000DA -:102E700000804020100800007818181818187800F2 -:102E80002070A82020202000002040F840200000D2 -:102E900020100800000000000000E01070906800A2 -:102EA0008080B0C888C8B000000070888080700042 -:102EB000080868988898680000007088F0807000A2 -:102EC000304840F04040400000007088887808F0AA -:102ED0008080B0C888888800200000202020200042 -:102EE0001000003010101060808090A0C0A09800EA -:102EF0006020202020207000000050A8A8A8A80072 -:102F00000000B04848484800000070888888700079 -:102F10000000F08888F080800000788888780808B1 -:102F20000000B04840404000000078807008F00089 -:102F30004040F84040483000000090909090680079 -:102F400000008888885020000000A8A8A8A8500089 -:102F5000000088502050880000008888986808F099 -:102F60000000F8102040F800204040804040200041 -:102F70002020200020202000201010081010200009 -:102F8000000040A810000000000000000000000049 -:102F900000000000001010101010000010000000D1 -:102FA000006C4848000000000000000000141428D5 -:102FB0007C287C2850500000001038404038487071 -:102FC00010100000002050200C70081408000000B1 -:102FD0000000001820205448340000000010101099 -:102FE0001000000000000000000808101010101071 -:102FF00010080800002020101010101010202000D1 -:1030000000107C10282800000000000000001010B4 -:1030100010FC10101000000000000000000000185C -:103020001030200000000000007C000000000000C4 -:103030000000000000000030300000000004040820 -:103040000810102020400000003844444444444408 -:103050003800000000301010101010107C0000002C -:1030600000384404081020447C0000000038440468 -:103070001804044438000000000C141424447C0498 -:103080000C000000003C20203804044438000000FC -:10309000001C20407844444438000000007C440474 -:1030A0000808081010000000003844443844444424 -:1030B0003800000000384444443C0408700000001C -:1030C0000000003030000030300000000000001828 -:1030D000180000183020000000000C106080601004 -:1030E0000C000000000000007C007C0000000000DC -:1030F0000000C02018041820C000000000001824A0 -:1031000004081000300000003844444C54544C4033 -:10311000443800000030102828287C44EC000000CF -:1031200000F8444478444444F8000000003C444023 -:10313000404040443800000000F0484444444448C3 -:10314000F000000000FC445070504044FC000000BF -:10315000007C20283828202070000000003C4440DB -:10316000404C44443800000000EC44447C44444457 -:10317000EC000000007C1010101010107C0000000B -:10318000003C0808084848483000000000EC44486B -:1031900050704844E40000000070202020202424C7 -:1031A0007C00000000EC6C6C54544444EC000000C3 -:1031B00000EC64645454544CEC0000000038444467 -:1031C000444444443800000000782424243820205B -:1031D000700000000038444444444444381C00005B -:1031E00000F8444444784844E000000000344C4077 -:1031F000380404645800000000FC901010101010F7 -:103200003800000000EC44444444444438000000CA -:1032100000EC4444282828101000000000EC44442E -:10322000545454542800000000C44428101028446A -:10323000C400000000EC44282810101038000000E2 -:10324000007C4408101020447C000000003820203E -:1032500020202020202038000040202020101008AE -:10326000080800000038080808080808080838009E -:1032700000101028440000000000000000000000C2 -:1032800000000000000000FC00100800000000002A -:103290000000000000000038443C44443C000000B2 -:1032A00000C0405864444444F80000000000003C62 -:1032B0004440404438000000000C04344C44444472 -:1032C0003C00000000000038447C40403C0000000E -:1032D000001C207C202020207C0000000000003406 -:1032E0004C4444443C04380000C0405864444444C6 -:1032F000EC00000000100070101010107C000000A6 -:1033000000100078080808080808700000C0405C39 -:1033100048705048DC0000000030101010101010F1 -:103320007C000000000000E854545454FC000000ED -:10333000000000D864444444EC0000000000003861 -:103340004444444438000000000000D8644444442D -:103350007840E000000000344C4444443C040C003D -:103360000000006C302020207C0000000000003CA9 -:1033700044380444780000000000207C20202020F5 -:103380001C000000000000CC4444444C3400000009 -:10339000000000EC4444282810000000000000EC6D -:1033A0004454545428000000000000CC48303048F9 -:1033B000CC000000000000EC442428181010780015 -:1033C0000000007C481020447C0000000008101021 -:1033D0001010201010100800001010101010101005 -:1033E0001010000000201010101008101010200005 -:1033F0000000000000245800000000000000000051 -:1034000000000000000000000000000000000018A4 -:103410003C3C3C181818001818000000006666664E -:103420006624000000000000000000000000000012 -:103430006C6CFE6C6C6CFE6C6C0000001818187CD8 -:10344000C6C2C07C0686C67C1818000000000000BA -:1034500000C2C60C183060C68600000000000038AC -:103460006C6C3876DCCCCCCC760000000030303090 -:103470003060000000000000000000000000000CB0 -:1034800018303030303030180C00000000000030B0 -:10349000180C0C0C0C0C0C18300000000000000084 -:1034A0000000663CFF3C66000000000000000000D9 -:1034B000000018187E18180000000000000000002E -:1034C0000000000000001818183000000000000084 -:1034D00000000000FE0000000000000000000000EE -:1034E00000000000000000181800000000000000AC -:1034F0000002060C183060C0800000000000007C54 -:10350000C6C6CED6D6E6C6C67C00000000000018AF -:1035100038781818181818187E0000000000007C71 -:10352000C6060C183060C0C6FE0000000000007C1B -:10353000C606063C060606C67C0000000000000C1D -:103540001C3C6CCCFE0C0C0C1E000000000000FEAD -:10355000C0C0C0FC0E0606C67C000000000000389B -:1035600060C0C0FCC6C6C6C67C000000000000FEED -:10357000C606060C18303030300000000000007C19 -:10358000C6C6C67CC6C6C6C67C0000000000007C5D -:10359000C6C6C67E0606060C7800000000000000C5 -:1035A00000181800000018180000000000000000BB -:1035B000001818000000181830000000000000007B -:1035C000060C18306030180C0600000000000000E7 -:1035D000000000FE0000FE000000000000000000EF -:1035E0006030180C060C1830600000000000007CF1 -:1035F000C6C60C18181800181800000000000000BB -:103600007CC6C6DEDEDEDCC07C00000000000010F0 -:10361000386CC6C6FEC6C6C6C6000000000000FC68 -:103620006666667C66666666FC0000000000003C1C -:1036300066C2C0C0C0C0C2663C000000000000F806 -:103640006C6666666666666CF8000000000000FE48 -:103650006662687868606266FE000000000000FE36 -:103660006662687868606060F00000000000003CFE -:1036700066C2C0C0DEC6C6663A000000000000C6D2 -:10368000C6C6C6FEC6C6C6C6C60000000000003CD0 -:1036900018181818181818183C0000000000001E10 -:1036A0000C0C0C0C0CCCCCCC78000000000000E61C -:1036B000666C6C78786C6666E6000000000000F0CE -:1036C0006060606060606266FE000000000000C62E -:1036D000EEFEFED6C6C6C6C6C6000000000000C686 -:1036E000E6F6FEDECEC6C6C6C60000000000003804 -:1036F0006CC6C6C6C6C6C66C38000000000000FC1A -:103700006666667C60606060F00000000000007C1F -:10371000C6C6C6C6C6C6D6DE7C0C0E00000000FCBF -:103720006666667C6C666666E60000000000007CEB -:10373000C6C660380C06C6C67C0000000000007ECD -:103740007E5A1818181818183C000000000000C60F -:10375000C6C6C6C6C6C6C6C67C000000000000C6F7 -:10376000C6C6C6C6C6C66C3810000000000000C63B -:10377000C6C6C6C6D6D6FE6C6C000000000000C6E9 -:10378000C66C6C38386C6CC6C60000000000006661 -:103790006666663C181818183C000000000000FE21 -:1037A000C6860C183060C2C6FE0000000000003C57 -:1037B00030303030303030303C000000000000004D -:1037C00080C0E070381C0E06020000000000003CC3 -:1037D0000C0C0C0C0C0C0C0C3C0000001038386C61 -:1037E000C600000000000000000000000000000013 -:1037F00000000000000000000000FF003030301822 -:1038000000000000000000000000000000000000B8 -:103810000000780C7CCCCCCC76000000000000E0EE -:103820006060786C66666666DC0000000000000080 -:1038300000007CC6C0C0C0C67C0000000000001CA8 -:103840000C0C3C6CCCCCCCCC760000000000000012 -:1038500000007CC6FEC0C0C67C000000000000382E -:103860006C6460F060606060F000000000000000C8 -:10387000000076CCCCCCCCCC7C0CCC78000000E02A -:1038800060606C7666666666E60000000000001800 -:1038900018003818181818183C000000000000061E -:1038A00006000E06060606060666663C000000E0F8 -:1038B0006060666C78786C66E60000000000003896 -:1038C00018181818181818183C00000000000000FC -:1038D0000000ECFED6D6D6D6D600000000000000D0 -:1038E0000000DC6666666666660000000000000098 -:1038F00000007CC6C6C6C6C67C00000000000000F2 -:103900000000DC66666666667C6060F000000000B1 -:10391000000076CCCCCCCCCC7C0C0C1E0000000083 -:103920000000DC7662606060F000000000000000D3 -:1039300000007CC660380CC67C000000000000104F -:103940003030FC30303030361C0000000000000009 -:103950000000CCCCCCCCCCCC760000000000000029 -:10396000000066666666663C180000000000000005 -:103970000000C6C6C6D6D6FE6C00000000000000DF -:103980000000C66C3838386CC6000000000000002B -:103990000000C6C6C6C6C6C67E060CF800000000FB -:1039A0000000FECC183060C6FE0000000000000ED3 -:1039B00018181870181818180E00000000000018C9 -:1039C00018181800181818181800000000000070C7 -:1039D0001818180E1818181870000000000000764B -:1039E000DC00000000000000000000000240410474 -:1039F000804204A04303804401004504204603C0E4 -:103A00004704004802004904704A03A04B04404C9C -:103A100002C04D02804E03E04F04605004D05103B9 -:103A20004052030053018054032055041056036094 -:103A30005704905804B05904C05A057831053832FB -:103A400005183305083405003505803605C03705EF -:103A5000E03805F03905F83006303F05902F0000BA -:103A60004261636B0A496E707574206D6F64650AFC -:103A700042757A7A65720A446973706C61790A4C8E -:103A8000616E67756167650A41626F757400000059 -:103A9000E8BF94E59B9E0AE8BE93E585A5E6A8A14C -:103AA000E5BC8F0AE89C82E9B8A3E599A85C6EE6BC -:103AB00098BEE7A4BA0AE8AFADE8A8800AE585B3E6 -:103AC000E4BA8E00E43A0008000000205000000034 -:103AD00028010008343B000850000020301000008E -:103AE0004401000801000000100000000000000078 -:103AF0000024F400000000000000000000000000AE -:103B000000000000000000000000000000000000B5 -:103B100000000000603A0008903A00080000000031 -:103B20000000000000000000000100000000000094 -:043B30000000000091 +:1027A0006CD0012804D0022848D0032867D157E014 +:1027B00001213046FEF74EF9014641481030FDF741 +:1027C000FFFF02213046FEF745F901463C48203024 +:1027D000FDF7F6FF6069002803DC394820304088A7 +:1027E00008B1FFF7D3FE6069002803DB34481030DE +:1027F000408808B1FFF7BAFE0021344B0822084692 +:102800000095FFF768FCA08831A1401CA0802C48EF +:1028100062883030FDF736FD294B082230333821ED +:1028200000200095FFF757FC7888FF2827D1022069 +:10283000A060FEF721F94044206120E02248BA78E8 +:10284000237820306169FFF7A4FC20B1012810D063 +:1028500002280ED101E0A5600BE00320A06008E093 +:102860001948BA78237834306169FFF792FC002860 +:10287000F1D0FEF701F92169884200D9A560FFF780 +:1028800013FFFDF763FFFFF733FBFEF7F5F8014693 +:10289000E06881427FF670AF00F57A70E0604FF437 +:1028A00000413046FEF7DBF8A08860800020A08061 +:1028B00062E7000000080140BC0000200401002085 +:1028C0004C010020000C0140100000209C09002059 +:1028D0004650533A256400004FF47F0C1CEAD01296 +:1028E0001EBF1CEAD11392EA0C0F93EA0C0F00F002 +:1028F000858090EA010F48BF42F4807240F4000CDA +:1029000041F400002CF07F4120F07F4000B581426F +:10291000A2EB03020FF2081CACEB504EC0F100001A +:102920009EF800E04FEA4E0E00FB0EFC38BF490057 +:102930004FEA2C1C02F5FA020CFB0EF34FEACE1EF6 +:102940004FEA112C4FEAC1210EEB635E42EB2242AB +:102950000EFB0CFC4FEA1C5300FB03114FEA112C39 +:102960004FEA01310EFB0CFC4FEADC4C00FB0C1172 +:10297000C14228BF09184CEB03335DF804EB10EBA0 +:10298000410143EBC250B2F57C0F38BF704729D5E7 +:1029900012F0F00F1CBF00F1C04000F00040704783 +:1029A000008182838485868788898B8C8D8E8F9128 +:1029B0009293959697999A9C9D9FA0A2A3A5A7A84C +:1029C000AAACAEB0B2B3B5B7B9BCBEC0C2C5C7C978 +:1029D000CCCED1D4D7D9DCDFE2E6E9ECF0F3F7FADC +:1029E000FE0000004FEA400C0CF1807CBCF17E4FF1 +:1029F00028BF7047B0F1C04000F043B990EA010F22 +:102A00000CEAD11348BF42F48072624538BF634577 +:102A100007D213F47F0F16D080EA010000F00040C7 +:102A2000704710B500F0E7F8097EFC3E00F005B8ED +:102A300080EA010000F00040704780EA010000F0E9 +:102A4000004000F01EB912F47F0F04BF0248704727 +:102A500080EA010000F015B90000C07FC10DD1F17E +:102A60009E0206DB4FEA002343F0004323FA02F004 +:102A70007047004207D54FEA4001B1F1FE4F02D244 +:102A80004FF00000704710B500F0B5F8499224806F +:102A9000002070476FEA20007047000010F00041EE +:102AA00048BF4042B0FA80F310FA03F2C3F19D032D +:102AB0000BD051EAC35101EB1220530638BF7047C7 +:102AC00000F1010008BF20F001007047B0FA80F368 +:102AD00010FA03F2C3F19D030AD0D90501EB1220CD +:102AE000530638BF704700F1010008BF20F0010015 +:102AF000704700004FF47F0C1CEAD0121EBF1CEA86 +:102B0000D11392EA0C0F93EA0C0F00F0478090EA81 +:102B1000010F48BF42F480724FF0004C4CEA002095 +:102B20004CEA012102EB0302A0FB0113A2F5000213 +:102B3000002918BF43F001035B0028BF4FEA3303AD +:102B400042EB22425FEA132C4CEBC2502EBFBCEB8F +:102B5000436FB2F57C0F70474FEA036CBCF1004F36 +:102B600008BF20F00100B2F57C0F38BF70470BD5CD +:102B700082F0FF0212F5803FC8BF704700F1C040ED +:102B8000D8BF00F00040704700F5000C5FEA4C0C25 +:102B900048BF7047B0F1C04000F073B890EA010F31 +:102BA0000CEAD11348BF42F48072624538BF6345D6 +:102BB00004D280EA010000F00040704710B500F038 +:102BC0001AF800BF8900013E00F007B800F009B80C +:102BD0005FEA410C5FEA1C6C08D080EA010000F05B +:102BE00050B85FEA400C5FEA1C6CF6D14FF0004031 +:102BF000A0F5800070470EF1020E2EF0030E5EF875 +:102C0000044B244204D44FEA4102B2F17F4F11D861 +:102C10004FEA4003B3F17F4F0CD80ED14FEAD07C7E +:102C2000B2F17F4F0CEB4C0C0CF1020C08BF4CEBDB +:102C3000D17C04E04FF0080C01E04FEAD17C0CEBB2 +:102C40004C0324FA03F404F00704B4F1040C06D294 +:102C50000EEB840CBDE810404CF0010C6047DFE83F +:102C60000CF0070802024FF00040A0F5800010BDF4 +:102C70000846420018BFD2F1807288BF00F00040C1 +:102C800010BDFF2141EAD050C00570470000000090 +:102C9000000000000102030406070809000000000C +:102CA000010203040000000000000000202020209A +:102CB0002000200050505000000000005050F850FC +:102CC000F85050002078C07028F02000C0C81020B4 +:102CD0004098180040A0A040A89068003020400014 +:102CE0000000000010204040402010004020101044 +:102CF0001020400020A8702070A82000202020F87C +:102D0000202020000000000060408000000000F84B +:102D100000000000000000000060600000081020BB +:102D200040800000708898A8C8887000206020202B +:102D300020207000708808304080F800F8081030BB +:102D40000888700010305090F8101000F880F008DB +:102D500008887000384080F088887000F8081020DB +:102D6000404040007088887088887000708888783B +:102D70000810E0000060600060600000006060001B +:102D80006060800010204080402010000000F800AB +:102D9000F80000004020100810204000708810202B +:102DA000200020007088B8A8B8807800205088885B +:102DB000F8888800F08888F08888F0007088808023 +:102DC00080887000F08888888888F000F88080F01B +:102DD0008080F800F88080F080808000708880809B +:102DE000B8887800888888F8888888007020202033 +:102DF0002020700038101010109060008890A0C043 +:102E0000A0908800808080808080F80088D8A8A862 +:102E1000888888008888C8A89888880070888888EA +:102E200088887000F08888F08080800070888888AA +:102E3000A8906800F08888F0A09088007088807062 +:102E400008887000F82020202020200088888888AA +:102E5000888870008888888888502000888888A89A +:102E6000A8D88800888850205088880088885020FA +:102E700020202000F80810204080F800F0C0C0C0DA +:102E8000C0C0F0000080402010080000781818181A +:102E9000181878002070A82020202000002040F87A +:102EA0004020000020100800000000000000E0109A +:102EB000709068008080B0C888C8B000000070883A +:102EC0008080700008086898889868000000708802 +:102ED000F0807000304840F04040400000007088B2 +:102EE000887808F08080B0C888888800200000209A +:102EF000202020001000003010101060808090A072 +:102F0000C0A098006020202020207000000050A861 +:102F1000A8A8A8000000B0484848480000007088F1 +:102F2000888870000000F08888F080800000788831 +:102F3000887808080000B0484040400000007880D1 +:102F40007008F0004040F840404830000000909089 +:102F50009090680000008888885020000000A8A891 +:102F6000A8A85000000088502050880000008888E1 +:102F7000986808F00000F8102040F80020404080D9 +:102F80004040200020202000202020002010100899 +:102F900010102000000040A81000000000000000F9 +:102FA00000000000000000000010101010100000D1 +:102FB00010000000006C4848000000000000000005 +:102FC000001414287C287C28505000000010384041 +:102FD0004038487010100000002050200C70081479 +:102FE00008000000000000182020544834000000B1 +:102FF0000010101010000000000000000008081071 +:1030000010101010100808000020201010101010D0 +:103010001020200000107C10282800000000000074 +:103020000000101010FC1010100000000000000044 +:10303000000000181030200000000000007C00009C +:103040000000000000000000000000303000000020 +:1030500000040408081010202040000000384444F8 +:103060004444444438000000003010101010101088 +:103070007C00000000384404081020447C0000005C +:10308000003844041804044438000000000C1414F0 +:1030900024447C040C000000003C2020380404443C +:1030A00038000000001C20407844444438000000F0 +:1030B000007C440408080810100000000038444454 +:1030C000384444443800000000384444443C040878 +:1030D00070000000000000303000003030000000C0 +:1030E00000000018180000183020000000000C102C +:1030F000608060100C000000000000007C007C007C +:10310000000000000000C02018041820C0000000CB +:103110000000182404081000300000003844444C1B +:1031200054544C40443800000030102828287C4477 +:10313000EC00000000F8444478444444F8000000E7 +:10314000003C4440404040443800000000F0484407 +:1031500044444448F000000000FC44507050404497 +:10316000FC000000007C202838282020700000008F +:10317000003C4440404C44443800000000EC4444CF +:103180007C444444EC000000007C1010101010102F +:103190007C000000003C0808084848483000000057 +:1031A00000EC444850704844E400000000702020C7 +:1031B000202024247C00000000EC6C6C5454444417 +:1031C000EC00000000EC64645454544CEC0000002B +:1031D0000038444444444444380000000078242427 +:1031E0002438202070000000003844444444444403 +:1031F000381C000000F8444444784844E0000000D3 +:1032000000344C40380404645800000000FC901066 +:10321000101010103800000000EC444444444444B2 +:103220003800000000EC444428282810100000005A +:1032300000EC4444545454542800000000C4442872 +:1032400010102844C400000000EC4428281010107E +:1032500038000000007C4408101020447C0000006E +:10326000003820202020202020203800004020206E +:10327000201010080808000000380808080808088E +:10328000080838000010102844000000000000006A +:103290000000000000000000000000FC001008001A +:1032A000000000000000000000000038443C4444DE +:1032B0003C00000000C0405864444444F800000052 +:1032C0000000003C4440404438000000000C04343E +:1032D0004C4444443C00000000000038447C404022 +:1032E0003C000000001C207C202020207C000000EE +:1032F000000000344C4444443C04380000C04058B2 +:1033000064444444EC0000000010007010101010E1 +:103310007C00000000100078080808080808700009 +:1033200000C0405C48705048DC00000000301010C5 +:10333000101010107C000000000000E85454545499 +:10334000FC000000000000D864444444EC0000008D +:10335000000000384444444438000000000000D815 +:10336000644444447840E000000000344C44444449 +:103370003C040C000000006C302020207C00000089 +:103380000000003C44380444780000000000207C29 +:10339000202020201C000000000000CC4444444CAD +:1033A00034000000000000EC444428281000000015 +:1033B000000000EC4454545428000000000000CCED +:1033C00048303048CC000000000000EC44242818AD +:1033D000101078000000007C481020447C000000A1 +:1033E000000810101010201010100800001010100D +:1033F00010101010101000000020101010100810F5 +:103400001010200000000000002458000000000000 +:1034100000000000000000000000000000000000AC +:10342000000000183C3C3C18181800181800000058 +:1034300000666666662400000000000000000000D0 +:10344000000000006C6CFE6C6C6CFE6C6C0000008C +:103450001818187CC6C2C07C0686C67C18180000E6 +:103460000000000000C2C60C183060C686000000D4 +:10347000000000386C6C3876DCCCCCCC76000000D8 +:10348000003030303060000000000000000000001C +:103490000000000C18303030303030180C000000C4 +:1034A00000000030180C0C0C0C0C0C183000000044 +:1034B000000000000000663CFF3C660000000000C9 +:1034C00000000000000018187E181800000000001E +:1034D0000000000000000000000018181830000074 +:1034E0000000000000000000FE00000000000000DE +:1034F000000000000000000000000018180000009C +:10350000000000000002060C183060C080000000BF +:103510000000007CC6C6CED6D6E6C6C67C0000003B +:103520000000001838781818181818187E000000C5 +:103530000000007CC6060C183060C0C6FE0000000B +:103540000000007CC606063C060606C67C0000009D +:103550000000000C1C3C6CCCFE0C0C0C1E0000008F +:10356000000000FEC0C0C0FC0E0606C67C000000C5 +:103570000000003860C0C0FCC6C6C6C67C000000A3 +:10358000000000FEC606060C183030303000000087 +:103590000000007CC6C6C67CC6C6C6C67C0000004D +:1035A0000000007CC6C6C67E0606060C7800000039 +:1035B00000000000001818000000181800000000AB +:1035C000000000000018180000001818300000006B +:1035D00000000000060C18306030180C06000000D7 +:1035E00000000000000000FE0000FE0000000000DF +:1035F000000000006030180C060C1830600000005D +:103600000000007CC6C60C1818180018180000002E +:10361000000000007CC6C6DEDEDEDCC07C000000F0 +:1036200000000010386CC6C6FEC6C6C6C600000044 +:10363000000000FC6666667C66666666FC0000004C +:103640000000003C66C2C0C0C0C0C2663C000000B2 +:10365000000000F86C6666666666666CF80000003E +:10366000000000FE6662687868606266FE00000026 +:10367000000000FE6662687868606060F00000002C +:103680000000003C66C2C0C0DEC6C6663A0000004C +:10369000000000C6C6C6C6FEC6C6C6C6C600000036 +:1036A0000000003C18181818181818183C000000E2 +:1036B0000000001E0C0C0C0C0CCCCCCC78000000D4 +:1036C000000000E6666C6C78786C6666E6000000C8 +:1036D000000000F06060606060606266FE000000F4 +:1036E000000000C6EEFEFED6C6C6C6C6C600000076 +:1036F000000000C6E6F6FEDECEC6C6C6C600000066 +:10370000000000386CC6C6C6C6C6C66C38000000CD +:10371000000000FC6666667C60606060F00000008F +:103720000000007CC6C6C6C6C6C6D6DE7C0C0E002F +:10373000000000FC6666667C6C666666E60000005B +:103740000000007CC6C660380C06C6C67C000000BF +:103750000000007E7E5A1818181818183C00000047 +:10376000000000C6C6C6C6C6C6C6C6C67C000000E7 +:10377000000000C6C6C6C6C6C6C66C38100000002B +:10378000000000C6C6C6C6C6D6D6FE6C6C000000D9 +:10379000000000C6C66C6C38386C6CC6C6000000F1 +:1037A000000000666666663C181818183C000000A9 +:1037B000000000FEC6860C183060C2C6FE00000085 +:1037C0000000003C30303030303030303C00000001 +:1037D0000000000080C0E070381C0E0602000000EF +:1037E0000000003C0C0C0C0C0C0C0C0C3C00000001 +:1037F0001038386CC6000000000000000000000017 +:103800000000000000000000000000000000FF00B9 +:103810003030301800000000000000000000000000 +:10382000000000000000780C7CCCCCCC76000000BE +:10383000000000E06060786C66666666DC00000090 +:103840000000000000007CC6C0C0C0C67C000000B4 +:103850000000001C0C0C3C6CCCCCCCCC76000000E6 +:103860000000000000007CC6FEC0C0C67C00000056 +:10387000000000386C6460F060606060F000000080 +:1038800000000000000076CCCCCCCCCC7C0CCC78FA +:10389000000000E060606C7666666666E600000028 +:1038A0000000001818003818181818183C000000FC +:1038B0000000000606000E06060606060666663CC2 +:1038C000000000E06060666C78786C66E6000000DE +:1038D0000000003818181818181818183C000000B4 +:1038E000000000000000ECFED6D6D6D6D6000000C0 +:1038F000000000000000DC66666666666600000088 +:103900000000000000007CC6C6C6C6C67C000000E1 +:10391000000000000000DC66666666667C6060F0A1 +:1039200000000000000076CCCCCCCCCC7C0C0C1E73 +:10393000000000000000DC7662606060F0000000C3 +:103940000000000000007CC660380CC67C0000004F +:10395000000000103030FC30303030361C000000E9 +:10396000000000000000CCCCCCCCCCCC7600000019 +:1039700000000000000066666666663C18000000F5 +:10398000000000000000C6C6C6D6D6FE6C000000CF +:10399000000000000000C66C3838386CC60000001B +:1039A000000000000000C6C6C6C6C6C67E060CF8EB +:1039B000000000000000FECC183060C6FE000000D1 +:1039C0000000000E18181870181818180E000000C3 +:1039D000000000181818180018181818180000000F +:1039E000000000701818180E181818187000000041 +:1039F00000000076DC000000000000000000000075 +:103A000002404104804204A0430380440100450475 +:103A1000204603C04704004802004904704A03A03E +:103A20004B04404C02C04D02804E03E04F046050F6 +:103A300004D0510340520300530180540320550425 +:103A4000105603605704905804B05904C05A0578C2 +:103A50003105383205183305083405003505803640 +:103A600005C03705E03805F03905F83006303F0568 +:103A7000902F00006E6F0A6F666600004261636BF4 +:103A80000A496E707574206D6F64650A42757A7AA2 +:103A900065720A446973706C61790A4C616E67756E +:103AA0006167650A41626F75740000004261636B73 +:103AB0000A496E7075740000E8BF94E59B9E0AE8A1 +:103AC000BE93E585A5E6A8A1E5BC8F0AE89C82E93E +:103AD000B8A3E599A85C6EE698BEE7A4BA0AE8AF79 +:103AE000ADE8A8800AE585B3E4BA8E00E8BF94E5A6 +:103AF0009B9E0AE8BE93E585A50000001C3B0008DC +:103B0000000000206800000028010008843B000835 +:103B1000680000203010000044010008010000008F +:103B200010000000000000000024F400000000006D +:103B30000000000000000000000000000000000085 +:103B40000000000000000000000000000000000075 +:103B5000000000007C3A0008B83A000800000000AD +:103B60000000000000000000AC3A0008EC3A000839 +:103B7000743A00080000000000010000000000008E +:043B80000000000041 :04000005080000ED02 :00000001FF diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.htm b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.htm index 290d8de..d0fb5e2 100644 --- a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.htm +++ b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.htm @@ -3,7 +3,7 @@ Static Call Graph - [f103c8t6_KEIL\f103c8t6_KEIL.axf]

Static Call Graph for image f103c8t6_KEIL\f103c8t6_KEIL.axf

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Tue May 10 17:43:01 2022 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Thu Aug 04 16:22:21 2022

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

Call chain for Maximum Stack Depth:

@@ -1221,7 +1221,7 @@ Global Symbols
[Called By]
  • >>   mymain
-

mymain (Thumb, 366 bytes, Stack size 8 bytes, mymain.o(i.mymain)) +

mymain (Thumb, 386 bytes, Stack size 8 bytes, mymain.o(i.mymain))

[Stack]

  • Max Depth = 216 + Unknown Stack Size
  • Call Chain = mymain ⇒ OLED_Cache_to_hardware ⇒ OLED_Set_Pos ⇒ OLED_WrCmd ⇒ IIC_SAND_DATE ⇒ HAL_I2C_Mem_Write ⇒ I2C_RequestMemoryWrite ⇒ I2C_WaitOnMasterAddressFlagUntilTimeout
diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.map b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.map index e2a1e86..d7d1a33 100644 --- a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.map +++ b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL.map @@ -1608,37 +1608,37 @@ Image Symbol Table i.mo_di 0x08002670 Section 0 morsr.o(i.mo_di) i.mo_server 0x080026a8 Section 0 morsr.o(i.mo_server) i.mymain 0x08002730 Section 0 mymain.o(i.mymain) - x$fpl$fdiv 0x080028c4 Section 388 fdiv.o(x$fpl$fdiv) - _fdiv1 0x080028c5 Thumb Code 0 fdiv.o(x$fpl$fdiv) - x$fpl$ffixu 0x08002a48 Section 62 ffixu.o(x$fpl$ffixu) - x$fpl$fflt 0x08002a88 Section 48 fflt_clz.o(x$fpl$fflt) - x$fpl$ffltu 0x08002ab8 Section 38 fflt_clz.o(x$fpl$ffltu) - x$fpl$fmul 0x08002ae0 Section 258 fmul.o(x$fpl$fmul) - x$fpl$fnaninf 0x08002be2 Section 140 fnaninf.o(x$fpl$fnaninf) - x$fpl$fretinf 0x08002c6e Section 10 fretinf.o(x$fpl$fretinf) - .constdata 0x08002c78 Section 16 system_stm32f1xx.o(.constdata) - x$fpl$usenofp 0x08002c78 Section 0 usenofp.o(x$fpl$usenofp) - .constdata 0x08002c88 Section 8 system_stm32f1xx.o(.constdata) - .constdata 0x08002c90 Section 3420 oled.o(.constdata) - .constdata 0x080039ec Section 114 morsr.o(.constdata) - .conststring 0x08003a60 Section 100 mymain.o(.conststring) + x$fpl$fdiv 0x080028d8 Section 388 fdiv.o(x$fpl$fdiv) + _fdiv1 0x080028d9 Thumb Code 0 fdiv.o(x$fpl$fdiv) + x$fpl$ffixu 0x08002a5c Section 62 ffixu.o(x$fpl$ffixu) + x$fpl$fflt 0x08002a9c Section 48 fflt_clz.o(x$fpl$fflt) + x$fpl$ffltu 0x08002acc Section 38 fflt_clz.o(x$fpl$ffltu) + x$fpl$fmul 0x08002af4 Section 258 fmul.o(x$fpl$fmul) + x$fpl$fnaninf 0x08002bf6 Section 140 fnaninf.o(x$fpl$fnaninf) + x$fpl$fretinf 0x08002c82 Section 10 fretinf.o(x$fpl$fretinf) + .constdata 0x08002c8c Section 16 system_stm32f1xx.o(.constdata) + x$fpl$usenofp 0x08002c8c Section 0 usenofp.o(x$fpl$usenofp) + .constdata 0x08002c9c Section 8 system_stm32f1xx.o(.constdata) + .constdata 0x08002ca4 Section 3420 oled.o(.constdata) + .constdata 0x08003a00 Section 114 morsr.o(.constdata) + .conststring 0x08003a74 Section 134 mymain.o(.conststring) .data 0x20000000 Section 12 stm32f1xx_hal.o(.data) .data 0x2000000c Section 4 system_stm32f1xx.o(.data) - .data 0x20000010 Section 48 mymain.o(.data) - .data 0x20000040 Section 16 morsr.o(.data) - last_input 0x20000045 Data 1 morsr.o(.data) - tick_time 0x2000004c Data 4 morsr.o(.data) - .bss 0x20000050 Section 228 main.o(.bss) - .bss 0x20000134 Section 64 mymain.o(.bss) - .bss 0x20000174 Section 2048 oled.o(.bss) - .bss 0x20000974 Section 16 buzzer.o(.bss) - .bss 0x20000984 Section 155 morsr.o(.bss) - .bss 0x20000a20 Section 96 libspace.o(.bss) - HEAP 0x20000a80 Section 512 startup_stm32f103xb.o(HEAP) - Heap_Mem 0x20000a80 Data 512 startup_stm32f103xb.o(HEAP) - STACK 0x20000c80 Section 1024 startup_stm32f103xb.o(STACK) - Stack_Mem 0x20000c80 Data 1024 startup_stm32f103xb.o(STACK) - __initial_sp 0x20001080 Data 0 startup_stm32f103xb.o(STACK) + .data 0x20000010 Section 72 mymain.o(.data) + .data 0x20000058 Section 16 morsr.o(.data) + last_input 0x2000005d Data 1 morsr.o(.data) + tick_time 0x20000064 Data 4 morsr.o(.data) + .bss 0x20000068 Section 228 main.o(.bss) + .bss 0x2000014c Section 64 mymain.o(.bss) + .bss 0x2000018c Section 2048 oled.o(.bss) + .bss 0x2000098c Section 16 buzzer.o(.bss) + .bss 0x2000099c Section 155 morsr.o(.bss) + .bss 0x20000a38 Section 96 libspace.o(.bss) + HEAP 0x20000a98 Section 512 startup_stm32f103xb.o(HEAP) + Heap_Mem 0x20000a98 Data 512 startup_stm32f103xb.o(HEAP) + STACK 0x20000c98 Section 1024 startup_stm32f103xb.o(STACK) + Stack_Mem 0x20000c98 Data 1024 startup_stm32f103xb.o(STACK) + __initial_sp 0x20001098 Data 0 startup_stm32f103xb.o(STACK) Global Symbols @@ -1901,28 +1901,28 @@ Image Symbol Table mo_da 0x08002631 Thumb Code 56 morsr.o(i.mo_da) mo_di 0x08002671 Thumb Code 46 morsr.o(i.mo_di) mo_server 0x080026a9 Thumb Code 126 morsr.o(i.mo_server) - mymain 0x08002731 Thumb Code 366 mymain.o(i.mymain) - __aeabi_fdiv 0x080028c5 Thumb Code 0 fdiv.o(x$fpl$fdiv) - _fdiv 0x080028c5 Thumb Code 384 fdiv.o(x$fpl$fdiv) - __aeabi_f2uiz 0x08002a49 Thumb Code 0 ffixu.o(x$fpl$ffixu) - _ffixu 0x08002a49 Thumb Code 62 ffixu.o(x$fpl$ffixu) - __aeabi_i2f 0x08002a89 Thumb Code 0 fflt_clz.o(x$fpl$fflt) - _fflt 0x08002a89 Thumb Code 48 fflt_clz.o(x$fpl$fflt) - __aeabi_ui2f 0x08002ab9 Thumb Code 0 fflt_clz.o(x$fpl$ffltu) - _ffltu 0x08002ab9 Thumb Code 38 fflt_clz.o(x$fpl$ffltu) - __aeabi_fmul 0x08002ae1 Thumb Code 0 fmul.o(x$fpl$fmul) - _fmul 0x08002ae1 Thumb Code 258 fmul.o(x$fpl$fmul) - __fpl_fnaninf 0x08002be3 Thumb Code 140 fnaninf.o(x$fpl$fnaninf) - __fpl_fretinf 0x08002c6f Thumb Code 10 fretinf.o(x$fpl$fretinf) - AHBPrescTable 0x08002c78 Data 16 system_stm32f1xx.o(.constdata) - __I$use$fp 0x08002c78 Number 0 usenofp.o(x$fpl$usenofp) - APBPrescTable 0x08002c88 Data 8 system_stm32f1xx.o(.constdata) - asc2_0805 0x08002c90 Data 760 oled.o(.constdata) - asc2_1206 0x08002f88 Data 1140 oled.o(.constdata) - asc2_1608 0x080033fc Data 1520 oled.o(.constdata) - morsecodes 0x080039ec Data 114 morsr.o(.constdata) - Region$$Table$$Base 0x08003ac4 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x08003ae4 Number 0 anon$$obj.o(Region$$Table) + mymain 0x08002731 Thumb Code 386 mymain.o(i.mymain) + __aeabi_fdiv 0x080028d9 Thumb Code 0 fdiv.o(x$fpl$fdiv) + _fdiv 0x080028d9 Thumb Code 384 fdiv.o(x$fpl$fdiv) + __aeabi_f2uiz 0x08002a5d Thumb Code 0 ffixu.o(x$fpl$ffixu) + _ffixu 0x08002a5d Thumb Code 62 ffixu.o(x$fpl$ffixu) + __aeabi_i2f 0x08002a9d Thumb Code 0 fflt_clz.o(x$fpl$fflt) + _fflt 0x08002a9d Thumb Code 48 fflt_clz.o(x$fpl$fflt) + __aeabi_ui2f 0x08002acd Thumb Code 0 fflt_clz.o(x$fpl$ffltu) + _ffltu 0x08002acd Thumb Code 38 fflt_clz.o(x$fpl$ffltu) + __aeabi_fmul 0x08002af5 Thumb Code 0 fmul.o(x$fpl$fmul) + _fmul 0x08002af5 Thumb Code 258 fmul.o(x$fpl$fmul) + __fpl_fnaninf 0x08002bf7 Thumb Code 140 fnaninf.o(x$fpl$fnaninf) + __fpl_fretinf 0x08002c83 Thumb Code 10 fretinf.o(x$fpl$fretinf) + AHBPrescTable 0x08002c8c Data 16 system_stm32f1xx.o(.constdata) + __I$use$fp 0x08002c8c Number 0 usenofp.o(x$fpl$usenofp) + APBPrescTable 0x08002c9c Data 8 system_stm32f1xx.o(.constdata) + asc2_0805 0x08002ca4 Data 760 oled.o(.constdata) + asc2_1206 0x08002f9c Data 1140 oled.o(.constdata) + asc2_1608 0x08003410 Data 1520 oled.o(.constdata) + morsecodes 0x08003a00 Data 114 morsr.o(.constdata) + Region$$Table$$Base 0x08003afc Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x08003b1c Number 0 anon$$obj.o(Region$$Table) uwTickFreq 0x20000000 Data 1 stm32f1xx_hal.o(.data) uwTickPrio 0x20000004 Data 4 stm32f1xx_hal.o(.data) uwTick 0x20000008 Data 4 stm32f1xx_hal.o(.data) @@ -1935,26 +1935,27 @@ Image Symbol Table jump_tick 0x20000020 Data 4 mymain.o(.data) encode_c 0x20000024 Data 4 mymain.o(.data) E1 0x20000028 Data 8 mymain.o(.data) - menu_main 0x20000030 Data 16 mymain.o(.data) - moser_buff_int 0x20000040 Data 1 morsr.o(.data) - moser_code_len 0x20000041 Data 1 morsr.o(.data) - moser_code 0x20000042 Data 1 morsr.o(.data) - moser_input_flag 0x20000043 Data 1 morsr.o(.data) - moser_input_true 0x20000044 Data 1 morsr.o(.data) - moser_tick_time 0x20000048 Data 4 morsr.o(.data) - hi2c1 0x20000050 Data 84 main.o(.bss) - htim2 0x200000a4 Data 72 main.o(.bss) - htim3 0x200000ec Data 72 main.o(.bss) - B1 0x20000134 Data 16 mymain.o(.bss) - TACKA 0x20000144 Data 16 mymain.o(.bss) - TACKB 0x20000154 Data 16 mymain.o(.bss) - str 0x20000164 Data 16 mymain.o(.bss) - OLED_buff 0x20000174 Data 1024 oled.o(.bss) - OLED_speedup 0x20000574 Data 1024 oled.o(.bss) - buzzer_play_buff 0x20000974 Data 16 buzzer.o(.bss) - moser_buff 0x20000984 Data 155 morsr.o(.bss) - __libspace_start 0x20000a20 Data 96 libspace.o(.bss) - __temporary_stack_top$libspace 0x20000a80 Data 0 libspace.o(.bss) + menu_main 0x20000030 Data 20 mymain.o(.data) + buzzer_setting 0x20000044 Data 20 mymain.o(.data) + moser_buff_int 0x20000058 Data 1 morsr.o(.data) + moser_code_len 0x20000059 Data 1 morsr.o(.data) + moser_code 0x2000005a Data 1 morsr.o(.data) + moser_input_flag 0x2000005b Data 1 morsr.o(.data) + moser_input_true 0x2000005c Data 1 morsr.o(.data) + moser_tick_time 0x20000060 Data 4 morsr.o(.data) + hi2c1 0x20000068 Data 84 main.o(.bss) + htim2 0x200000bc Data 72 main.o(.bss) + htim3 0x20000104 Data 72 main.o(.bss) + B1 0x2000014c Data 16 mymain.o(.bss) + TACKA 0x2000015c Data 16 mymain.o(.bss) + TACKB 0x2000016c Data 16 mymain.o(.bss) + str 0x2000017c Data 16 mymain.o(.bss) + OLED_buff 0x2000018c Data 1024 oled.o(.bss) + OLED_speedup 0x2000058c Data 1024 oled.o(.bss) + buzzer_play_buff 0x2000098c Data 16 buzzer.o(.bss) + moser_buff 0x2000099c Data 155 morsr.o(.bss) + __libspace_start 0x20000a38 Data 96 libspace.o(.bss) + __temporary_stack_top$libspace 0x20000a98 Data 0 libspace.o(.bss) @@ -1964,9 +1965,9 @@ Memory Map of the image Image Entry point : 0x080000ed - Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00003b34, Max: 0x00010000, ABSOLUTE) + Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00003b84, Max: 0x00010000, ABSOLUTE) - Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00003ae4, Max: 0x00010000, ABSOLUTE) + Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00003b1c, Max: 0x00010000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -2163,43 +2164,44 @@ Memory Map of the image 0x08002630 0x08002630 0x00000040 Code RO 3092 i.mo_da morsr.o 0x08002670 0x08002670 0x00000038 Code RO 3093 i.mo_di morsr.o 0x080026a8 0x080026a8 0x00000088 Code RO 3095 i.mo_server morsr.o - 0x08002730 0x08002730 0x00000194 Code RO 2832 i.mymain mymain.o - 0x080028c4 0x080028c4 0x00000184 Code RO 3259 x$fpl$fdiv fz_ws.l(fdiv.o) - 0x08002a48 0x08002a48 0x0000003e Code RO 3262 x$fpl$ffixu fz_ws.l(ffixu.o) - 0x08002a86 0x08002a86 0x00000002 PAD - 0x08002a88 0x08002a88 0x00000030 Code RO 3267 x$fpl$fflt fz_ws.l(fflt_clz.o) - 0x08002ab8 0x08002ab8 0x00000026 Code RO 3266 x$fpl$ffltu fz_ws.l(fflt_clz.o) - 0x08002ade 0x08002ade 0x00000002 PAD - 0x08002ae0 0x08002ae0 0x00000102 Code RO 3272 x$fpl$fmul fz_ws.l(fmul.o) - 0x08002be2 0x08002be2 0x0000008c Code RO 3362 x$fpl$fnaninf fz_ws.l(fnaninf.o) - 0x08002c6e 0x08002c6e 0x0000000a Code RO 3364 x$fpl$fretinf fz_ws.l(fretinf.o) - 0x08002c78 0x08002c78 0x00000000 Code RO 3366 x$fpl$usenofp fz_ws.l(usenofp.o) - 0x08002c78 0x08002c78 0x00000010 Data RO 2758 .constdata system_stm32f1xx.o - 0x08002c88 0x08002c88 0x00000008 Data RO 2759 .constdata system_stm32f1xx.o - 0x08002c90 0x08002c90 0x00000d5c Data RO 2915 .constdata oled.o - 0x080039ec 0x080039ec 0x00000072 Data RO 3097 .constdata morsr.o - 0x08003a5e 0x08003a5e 0x00000002 PAD - 0x08003a60 0x08003a60 0x00000064 Data RO 2834 .conststring mymain.o - 0x08003ac4 0x08003ac4 0x00000020 Data RO 3493 Region$$Table anon$$obj.o + 0x08002730 0x08002730 0x000001a8 Code RO 2832 i.mymain mymain.o + 0x080028d8 0x080028d8 0x00000184 Code RO 3259 x$fpl$fdiv fz_ws.l(fdiv.o) + 0x08002a5c 0x08002a5c 0x0000003e Code RO 3262 x$fpl$ffixu fz_ws.l(ffixu.o) + 0x08002a9a 0x08002a9a 0x00000002 PAD + 0x08002a9c 0x08002a9c 0x00000030 Code RO 3267 x$fpl$fflt fz_ws.l(fflt_clz.o) + 0x08002acc 0x08002acc 0x00000026 Code RO 3266 x$fpl$ffltu fz_ws.l(fflt_clz.o) + 0x08002af2 0x08002af2 0x00000002 PAD + 0x08002af4 0x08002af4 0x00000102 Code RO 3272 x$fpl$fmul fz_ws.l(fmul.o) + 0x08002bf6 0x08002bf6 0x0000008c Code RO 3362 x$fpl$fnaninf fz_ws.l(fnaninf.o) + 0x08002c82 0x08002c82 0x0000000a Code RO 3364 x$fpl$fretinf fz_ws.l(fretinf.o) + 0x08002c8c 0x08002c8c 0x00000000 Code RO 3366 x$fpl$usenofp fz_ws.l(usenofp.o) + 0x08002c8c 0x08002c8c 0x00000010 Data RO 2758 .constdata system_stm32f1xx.o + 0x08002c9c 0x08002c9c 0x00000008 Data RO 2759 .constdata system_stm32f1xx.o + 0x08002ca4 0x08002ca4 0x00000d5c Data RO 2915 .constdata oled.o + 0x08003a00 0x08003a00 0x00000072 Data RO 3097 .constdata morsr.o + 0x08003a72 0x08003a72 0x00000002 PAD + 0x08003a74 0x08003a74 0x00000086 Data RO 2834 .conststring mymain.o + 0x08003afa 0x08003afa 0x00000002 PAD + 0x08003afc 0x08003afc 0x00000020 Data RO 3493 Region$$Table anon$$obj.o - Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08003ae4, Size: 0x00001080, Max: 0x00005000, ABSOLUTE) + Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08003b1c, Size: 0x00001098, Max: 0x00005000, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x08003ae4 0x0000000c Data RW 833 .data stm32f1xx_hal.o - 0x2000000c 0x08003af0 0x00000004 Data RW 2760 .data system_stm32f1xx.o - 0x20000010 0x08003af4 0x00000030 Data RW 2835 .data mymain.o - 0x20000040 0x08003b24 0x00000010 Data RW 3098 .data morsr.o - 0x20000050 - 0x000000e4 Zero RW 19 .bss main.o - 0x20000134 - 0x00000040 Zero RW 2833 .bss mymain.o - 0x20000174 - 0x00000800 Zero RW 2914 .bss oled.o - 0x20000974 - 0x00000010 Zero RW 3020 .bss buzzer.o - 0x20000984 - 0x0000009b Zero RW 3096 .bss morsr.o - 0x20000a1f 0x08003b34 0x00000001 PAD - 0x20000a20 - 0x00000060 Zero RW 3370 .bss c_w.l(libspace.o) - 0x20000a80 - 0x00000200 Zero RW 2 HEAP startup_stm32f103xb.o - 0x20000c80 - 0x00000400 Zero RW 1 STACK startup_stm32f103xb.o + 0x20000000 0x08003b1c 0x0000000c Data RW 833 .data stm32f1xx_hal.o + 0x2000000c 0x08003b28 0x00000004 Data RW 2760 .data system_stm32f1xx.o + 0x20000010 0x08003b2c 0x00000048 Data RW 2835 .data mymain.o + 0x20000058 0x08003b74 0x00000010 Data RW 3098 .data morsr.o + 0x20000068 - 0x000000e4 Zero RW 19 .bss main.o + 0x2000014c - 0x00000040 Zero RW 2833 .bss mymain.o + 0x2000018c - 0x00000800 Zero RW 2914 .bss oled.o + 0x2000098c - 0x00000010 Zero RW 3020 .bss buzzer.o + 0x2000099c - 0x0000009b Zero RW 3096 .bss morsr.o + 0x20000a37 0x08003b84 0x00000001 PAD + 0x20000a38 - 0x00000060 Zero RW 3370 .bss c_w.l(libspace.o) + 0x20000a98 - 0x00000200 Zero RW 2 HEAP startup_stm32f103xb.o + 0x20000c98 - 0x00000400 Zero RW 1 STACK startup_stm32f103xb.o ============================================================================== @@ -2214,7 +2216,7 @@ Image component sizes 28 6 0 0 0 920 hread_interface.o 782 50 0 0 228 428588 main.o 308 34 114 16 155 4150 morsr.o - 518 46 100 48 64 4940 mymain.o + 538 46 134 72 64 5011 mymain.o 1034 28 3420 0 2048 8860 oled.o 64 26 236 0 1536 816 startup_stm32f103xb.o 128 24 0 12 0 5325 stm32f1xx_hal.o @@ -2229,9 +2231,9 @@ Image component sizes 2 0 24 4 0 1131 system_stm32f1xx.o ---------------------------------------------------------------------- - 8768 534 3928 80 4048 533922 Object Totals + 8788 534 3964 104 4048 533993 Object Totals 0 0 32 0 0 0 (incl. Generated) - 16 0 2 0 1 0 (incl. Padding) + 16 0 4 0 1 0 (incl. Padding) ---------------------------------------------------------------------- @@ -2309,15 +2311,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 11148 728 3928 80 4144 530114 Grand Totals - 11148 728 3928 80 4144 530114 ELF Image Totals - 11148 728 3928 80 0 0 ROM Totals + 11168 728 3964 104 4144 530185 Grand Totals + 11168 728 3964 104 4144 530185 ELF Image Totals + 11168 728 3964 104 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 15076 ( 14.72kB) - Total RW Size (RW Data + ZI Data) 4224 ( 4.13kB) - Total ROM Size (Code + RO Data + RW Data) 15156 ( 14.80kB) + Total RO Size (Code + RO Data) 15132 ( 14.78kB) + Total RW Size (RW Data + ZI Data) 4248 ( 4.15kB) + Total ROM Size (Code + RO Data + RW Data) 15236 ( 14.88kB) ============================================================================== diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL_f103c8t6_KEIL.dep b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL_f103c8t6_KEIL.dep index 84bab34..b582fb4 100644 --- a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL_f103c8t6_KEIL.dep +++ b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/f103c8t6_KEIL_f103c8t6_KEIL.dep @@ -31,7 +31,7 @@ I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h)(0x626A2FD0) I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h)(0x626A2FD0) I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h)(0x626A2FD0) I (./MYDEIVERS/mymain.h)(0x627A339F) -I (./MYDEIVERS/oled.h)(0x627A339F) +I (./MYDEIVERS/oled.h)(0x62EB7633) I (./MYDEIVERS/hread_interface.h)(0x6270CBAF) I (./MYDEIVERS/buzzer.h)(0x6270CBAF) I (./MYDEIVERS/encode.h)(0x6273A52D) @@ -545,7 +545,7 @@ I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h)(0x626A2FD0) I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h)(0x626A2FD0) I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h)(0x626A2FD0) I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h)(0x626A2FD0) -F (.\MYDEIVERS\mymain.c)(0x627A2EC9)(--c99 -c --cpu Cortex-M3 -D__EVAL -g -O3 --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ./MYDEIVERS -I.\RTE\_f103c8t6_KEIL -IC:\Users\kevin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include -IC:\Users\kevin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include -D__UVISION_VERSION="536" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F103xB -o f103c8t6_keil\mymain.o --omf_browse f103c8t6_keil\mymain.crf --depend f103c8t6_keil\mymain.d) +F (.\MYDEIVERS\mymain.c)(0x62EB81B9)(--c99 -c --cpu Cortex-M3 -D__EVAL -g -O3 --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ./MYDEIVERS -I.\RTE\_f103c8t6_KEIL -IC:\Users\kevin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include -IC:\Users\kevin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include -D__UVISION_VERSION="536" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F103xB -o f103c8t6_keil\mymain.o --omf_browse f103c8t6_keil\mymain.crf --depend f103c8t6_keil\mymain.d) I (MYDEIVERS\mymain.h)(0x627A339F) I (../Core/Inc/main.h)(0x6270CBAF) I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h)(0x626A2FD0) @@ -575,13 +575,13 @@ I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_i2c.h)(0x626A2FD0) I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h)(0x626A2FD0) I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h)(0x626A2FD0) I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h)(0x626A2FD0) -I (MYDEIVERS\oled.h)(0x627A339F) +I (MYDEIVERS\oled.h)(0x62EB7633) I (MYDEIVERS\hread_interface.h)(0x6270CBAF) I (MYDEIVERS\buzzer.h)(0x6270CBAF) I (MYDEIVERS\encode.h)(0x6273A52D) I (MYDEIVERS\morsr.h)(0x627A2660) F (.\MYDEIVERS\oled.c)(0x626A42BB)(--c99 -c --cpu Cortex-M3 -D__EVAL -g -O3 --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc -I ../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F1xx/Include -I ../Drivers/CMSIS/Include -I ./MYDEIVERS -I.\RTE\_f103c8t6_KEIL -IC:\Users\kevin\AppData\Local\Arm\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include -IC:\Users\kevin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include -D__UVISION_VERSION="536" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F103xB -o f103c8t6_keil\oled.o --omf_browse f103c8t6_keil\oled.crf --depend f103c8t6_keil\oled.d) -I (MYDEIVERS\oled.h)(0x627A339F) +I (MYDEIVERS\oled.h)(0x62EB7633) I (../Core/Inc/main.h)(0x6270CBAF) I (../Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h)(0x626A2FD0) I (../Core/Inc/stm32f1xx_hal_conf.h)(0x626A4A76) diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/main.crf b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/main.crf index 03a17d4..4c881ea 100644 Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/main.crf and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/main.crf differ diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/main.o b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/main.o index 8cb1754..054ff4b 100644 Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/main.o and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/main.o differ diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/mymain.crf b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/mymain.crf index a7b909f..66e3b5b 100644 Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/mymain.crf and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/mymain.crf differ diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/mymain.o b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/mymain.o index 606e880..894f866 100644 Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/mymain.o and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/mymain.o differ diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/oled.crf b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/oled.crf index 7491cea..ce31058 100644 Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/oled.crf and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/oled.crf differ diff --git a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/oled.o b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/oled.o index 8bb2fda..55504eb 100644 Binary files a/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/oled.o and b/f103c8t6_keil/MDK-ARM/f103c8t6_KEIL/oled.o differ