From a7f58af6643ab46a4dcc1464bf3c2161718df22d Mon Sep 17 00:00:00 2001 From: Schrom01 Date: Fri, 11 Nov 2022 09:45:39 +0100 Subject: [PATCH] solved Task 3b --- project/app/struct_code.s | 53 ++-- project/build/struct_code.lst | 366 +++++++++++++----------- project/build/struct_code.o | Bin 2520 -> 2540 bytes project/build/strukt_code.axf | Bin 48956 -> 48976 bytes project/build/strukt_code.build_log.htm | 24 +- project/build/strukt_code.htm | 4 +- project/build/strukt_code.map | 36 +-- project/build/strukt_code_Target 1.dep | 2 +- project/strukt_code.uvguix.roman | 26 +- project/strukt_code.uvoptx | 19 +- 10 files changed, 276 insertions(+), 254 deletions(-) diff --git a/project/app/struct_code.s b/project/app/struct_code.s index 5b341c1..3a99cbc 100644 --- a/project/app/struct_code.s +++ b/project/app/struct_code.s @@ -77,6 +77,9 @@ main PROC main_loop ; STUDENTS: To be programmed + + ; Clear LCD + BL clear_lcd_colour ; Read ADC Value to R0 BL adc_get_value @@ -105,56 +108,64 @@ case_blue LDR R4, =DISPLAY_COLOUR_BLUE LDR R5, =0xffff STRH R5, [R3, R4] - LDR R4, =DISPLAY_COLOUR_RED - LDR R5, =0x0000 - STRH R5, [R3, R4] - LDR R4, =DISPLAY_COLOUR_GREEN - LDR R5, =0x0000 - STRH R5, [R3, R4] ; Show Diff on 7-Segment LDR R3, =ADDR_7_SEG_BIN_DS3_0 STRB R2, [R3] - B end_cases + B main_loop case_red ; Make LCD Display Red LDR R3, =ADDR_LCD_COLOUR LDR R4, =DISPLAY_COLOUR_RED LDR R5, =0xffff STRH R5, [R3, R4] - LDR R4, =DISPLAY_COLOUR_BLUE - LDR R5, =0x0000 - STRH R5, [R3, R4] - LDR R4, =DISPLAY_COLOUR_GREEN - LDR R5, =0x0000 - STRH R5, [R3, R4] ; Show Diff on 7-Segment LDR R3, =ADDR_7_SEG_BIN_DS3_0 STRB R2, [R3] - B end_cases + B main_loop case_green ; Make LCD Display Green LDR R3, =ADDR_LCD_COLOUR LDR R4, =DISPLAY_COLOUR_GREEN LDR R5, =0xffff STRH R5, [R3, R4] - LDR R4, =DISPLAY_COLOUR_RED - LDR R5, =0x0000 - STRH R5, [R3, R4] - LDR R4, =DISPLAY_COLOUR_BLUE - LDR R5, =0x0000 - STRH R5, [R3, R4] ; Show ADC Value on 7-Semgment LDR R3, =ADDR_7_SEG_BIN_DS3_0 STRB R0, [R3] + + LDR R1, =0x0 ; Register to show on LEDs + LDR R2, =0x1 ; Value 0x1 + LSRS R0, R0, #3 ; Counter +led_loop + BEQ end_led_loop + LSLS R1, R2 + ORRS R1, R1, R2 + SUBS R0, R0, R2 + B led_loop +end_led_loop + LDR R0, =ADDR_LED_31_0 + STR R1, [R0] + -end_cases ; END: To be programmed B main_loop + +clear_lcd_colour + PUSH {R0, R1, R2} + LDR R0, =ADDR_LCD_COLOUR + LDR R2, =0x0 + LDR R1, =DISPLAY_COLOUR_RED + STRH R2, [R0, R1] + LDR R1, =DISPLAY_COLOUR_BLUE + STRH R2, [R0, R1] + LDR R1, =DISPLAY_COLOUR_GREEN + STRH R2, [R0, R1] + POP {R0, R1, R2} + BX LR clear_lcd PUSH {R0, R1, R2} diff --git a/project/build/struct_code.lst b/project/build/struct_code.lst index 8e644b8..a698a3d 100644 --- a/project/build/struct_code.lst +++ b/project/build/struct_code.lst @@ -142,151 +142,164 @@ ARM Macro Assembler Page 3 73 00000000 export main 74 00000000 ; 8 bit resolution, cont. sampling 75 00000000 F7FF FFFE BL adc_init - 76 00000004 F000 F832 BL clear_lcd + 76 00000004 F000 F837 BL clear_lcd 77 00000008 78 00000008 main_loop 79 00000008 ; STUDENTS: To be programmed 80 00000008 - 81 00000008 ; Read ADC Value to R0 - 82 00000008 F7FF FFFE BL adc_get_value + 81 00000008 ; Clear LCD + 82 00000008 F000 F82A BL clear_lcd_colour 83 0000000C - 84 0000000C ; check T0 - 85 0000000C 4920 LDR R1, =ADDR_BUTTONS - 86 0000000E 7809 LDRB R1, [R1] - 87 00000010 4A20 LDR R2, =0x01 - 88 00000012 4211 TST R1, R2 - 89 00000014 D11D BNE case_green ; If T0 is pressed: + 84 0000000C ; Read ADC Value to R0 + 85 0000000C F7FF FFFE BL adc_get_value + 86 00000010 + 87 00000010 ; check T0 + 88 00000010 4922 LDR R1, =ADDR_BUTTONS + 89 00000012 7809 LDRB R1, [R1] + 90 00000014 4A22 LDR R2, =0x01 + 91 00000016 4211 TST R1, R2 + 92 00000018 D111 BNE case_green ; If T0 is pressed: goto case_green, e lse: continue - 90 00000016 - 91 00000016 ; Else (T0 is not pressed): - 92 00000016 - 93 00000016 ; Read 8-bit value from DIP-Switch 7-0 to R1 - 94 00000016 4920 LDR R1, =ADDR_DIP_SWITCH_7_0 - 95 00000018 7809 LDRB R1, [R1] - 96 0000001A - 97 0000001A ; Calc diff: DIP-Switch-7-0 - ADC-Value - 98 0000001A 1A0A SUBS R2, R1, R0 - 99 0000001C DB0C BLT case_red ; IF diff >= 0: con + 93 0000001A + 94 0000001A ; Else (T0 is not pressed): + 95 0000001A + 96 0000001A ; Read 8-bit value from DIP-Switch 7-0 to R1 + 97 0000001A 4922 LDR R1, =ADDR_DIP_SWITCH_7_0 + 98 0000001C 7809 LDRB R1, [R1] + 99 0000001E + 100 0000001E ; Calc diff: DIP-Switch-7-0 - ADC-Value + 101 0000001E 1A0A SUBS R2, R1, R0 + 102 00000020 DB06 BLT case_red ; IF diff >= 0: con tinue case blue, el se: goto case red - 100 0000001E - 101 0000001E - 102 0000001E case_blue - 103 0000001E ; Make LCD Display Blue - 104 0000001E 4B1F LDR R3, =ADDR_LCD_COLOUR - 105 00000020 4C1F LDR R4, =DISPLAY_COLOUR_BLUE - 106 00000022 4D20 LDR R5, =0xffff - 107 00000024 531D STRH R5, [R3, R4] - 108 00000026 4C20 LDR R4, =DISPLAY_COLOUR_RED - 109 00000028 4D1F LDR R5, =0x0000 - 110 0000002A 531D STRH R5, [R3, R4] - 111 0000002C 4C1F LDR R4, =DISPLAY_COLOUR_GREEN - 112 0000002E 4D1E LDR R5, =0x0000 - 113 00000030 531D STRH R5, [R3, R4] - 114 00000032 - 115 00000032 ; Show Diff on 7-Segment - 116 00000032 4B1F LDR R3, =ADDR_7_SEG_BIN_DS3_0 - 117 00000034 701A STRB R2, [R3] - 118 00000036 - 119 00000036 E018 B end_cases - 120 00000038 case_red - 121 00000038 ; Make LCD Display Red - 122 00000038 4B18 LDR R3, =ADDR_LCD_COLOUR + 103 00000022 + 104 00000022 + 105 00000022 case_blue + 106 00000022 ; Make LCD Display Blue + 107 00000022 4B21 LDR R3, =ADDR_LCD_COLOUR + 108 00000024 4C21 LDR R4, =DISPLAY_COLOUR_BLUE + 109 00000026 4D22 LDR R5, =0xffff + 110 00000028 531D STRH R5, [R3, R4] + 111 0000002A + 112 0000002A ; Show Diff on 7-Segment + 113 0000002A 4B22 LDR R3, =ADDR_7_SEG_BIN_DS3_0 + 114 0000002C 701A STRB R2, [R3] + 115 0000002E + 116 0000002E E7EB B main_loop + 117 00000030 case_red + 118 00000030 ; Make LCD Display Red + 119 00000030 4B1D LDR R3, =ADDR_LCD_COLOUR + 120 00000032 4C21 LDR R4, =DISPLAY_COLOUR_RED + 121 00000034 4D1E LDR R5, =0xffff + 122 00000036 531D STRH R5, [R3, R4] ARM Macro Assembler Page 4 - 123 0000003A 4C1B LDR R4, =DISPLAY_COLOUR_RED - 124 0000003C 4D19 LDR R5, =0xffff - 125 0000003E 531D STRH R5, [R3, R4] - 126 00000040 4C17 LDR R4, =DISPLAY_COLOUR_BLUE - 127 00000042 4D19 LDR R5, =0x0000 - 128 00000044 531D STRH R5, [R3, R4] - 129 00000046 4C19 LDR R4, =DISPLAY_COLOUR_GREEN - 130 00000048 4D17 LDR R5, =0x0000 - 131 0000004A 531D STRH R5, [R3, R4] - 132 0000004C - 133 0000004C ; Show Diff on 7-Segment - 134 0000004C 4B18 LDR R3, =ADDR_7_SEG_BIN_DS3_0 - 135 0000004E 701A STRB R2, [R3] - 136 00000050 - 137 00000050 E00B B end_cases - 138 00000052 case_green - 139 00000052 ; Make LCD Display Green - 140 00000052 4B12 LDR R3, =ADDR_LCD_COLOUR - 141 00000054 4C15 LDR R4, =DISPLAY_COLOUR_GREEN - 142 00000056 4D13 LDR R5, =0xffff - 143 00000058 531D STRH R5, [R3, R4] - 144 0000005A 4C13 LDR R4, =DISPLAY_COLOUR_RED - 145 0000005C 4D12 LDR R5, =0x0000 - 146 0000005E 531D STRH R5, [R3, R4] - 147 00000060 4C0F LDR R4, =DISPLAY_COLOUR_BLUE - 148 00000062 4D11 LDR R5, =0x0000 - 149 00000064 531D STRH R5, [R3, R4] - 150 00000066 - 151 00000066 ; Show ADC Value on 7-Semgment - 152 00000066 4B12 LDR R3, =ADDR_7_SEG_BIN_DS3_0 - 153 00000068 7018 STRB R0, [R3] - 154 0000006A - 155 0000006A end_cases - 156 0000006A ; END: To be programmed - 157 0000006A E7CD B main_loop - 158 0000006C - 159 0000006C clear_lcd - 160 0000006C B407 PUSH {R0, R1, R2} - 161 0000006E 4A0E LDR R2, =0x0 - 162 00000070 clear_lcd_loop - 163 00000070 4810 LDR R0, =ADDR_LCD_ASCII - 164 00000072 1880 ADDS R0, R0, R2 ; add index to lcd + 123 00000038 + 124 00000038 ; Show Diff on 7-Segment + 125 00000038 4B1E LDR R3, =ADDR_7_SEG_BIN_DS3_0 + 126 0000003A 701A STRB R2, [R3] + 127 0000003C + 128 0000003C E7E4 B main_loop + 129 0000003E case_green + 130 0000003E ; Make LCD Display Green + 131 0000003E 4B1A LDR R3, =ADDR_LCD_COLOUR + 132 00000040 4C1E LDR R4, =DISPLAY_COLOUR_GREEN + 133 00000042 4D1B LDR R5, =0xffff + 134 00000044 531D STRH R5, [R3, R4] + 135 00000046 + 136 00000046 ; Show ADC Value on 7-Semgment + 137 00000046 4B1B LDR R3, =ADDR_7_SEG_BIN_DS3_0 + 138 00000048 7018 STRB R0, [R3] + 139 0000004A + 140 0000004A 491B LDR R1, =0x0 ; Register to show + on LEDs + 141 0000004C 4A14 LDR R2, =0x1 ; Value 0x1 + 142 0000004E 08C0 LSRS R0, R0, #3 ; Counter + 143 00000050 led_loop + 144 00000050 D003 BEQ end_led_loop + 145 00000052 4091 LSLS R1, R2 + 146 00000054 4311 ORRS R1, R1, R2 + 147 00000056 1A80 SUBS R0, R0, R2 + 148 00000058 E7FA B led_loop + 149 0000005A end_led_loop + 150 0000005A 4819 LDR R0, =ADDR_LED_31_0 + 151 0000005C 6001 STR R1, [R0] + 152 0000005E + 153 0000005E + 154 0000005E ; END: To be programmed + 155 0000005E E7D3 B main_loop + 156 00000060 + 157 00000060 clear_lcd_colour + 158 00000060 B407 PUSH {R0, R1, R2} + 159 00000062 4811 LDR R0, =ADDR_LCD_COLOUR + 160 00000064 4A14 LDR R2, =0x0 + 161 00000066 4914 LDR R1, =DISPLAY_COLOUR_RED + 162 00000068 5242 STRH R2, [R0, R1] + 163 0000006A 4910 LDR R1, =DISPLAY_COLOUR_BLUE + 164 0000006C 5242 STRH R2, [R0, R1] + 165 0000006E 4913 LDR R1, =DISPLAY_COLOUR_GREEN + 166 00000070 5242 STRH R2, [R0, R1] + 167 00000072 BC07 POP {R0, R1, R2} + 168 00000074 4770 BX LR + 169 00000076 + 170 00000076 clear_lcd + 171 00000076 B407 PUSH {R0, R1, R2} + 172 00000078 4A0F LDR R2, =0x0 + 173 0000007A clear_lcd_loop + 174 0000007A 4812 LDR R0, =ADDR_LCD_ASCII + 175 0000007C 1880 ADDS R0, R0, R2 ; add index to lcd offset - 165 00000074 490C LDR R1, =ASCII_DIGIT_CLEAR - 166 00000076 6001 STR R1, [R0] - 167 00000078 1D12 ADDS R2, R2, #4 ; increas index by + 176 0000007E 490E LDR R1, =ASCII_DIGIT_CLEAR + 177 00000080 6001 STR R1, [R0] + 178 00000082 1D12 ADDS R2, R2, #4 ; increas index by 4 (word step) - 168 0000007A 2A28 CMP R2, #LCD_LAST_OFFSET ; until in - dex reached last lc - d point - 169 0000007C D4F8 BMI clear_lcd_loop - 170 0000007E BC07 POP {R0, R1, R2} - 171 00000080 4770 BX LR - 172 00000082 - 173 00000082 write_bit_ascii - 174 00000082 B403 PUSH {R0, R1} - 175 00000084 480C LDR R0, =ADDR_LCD_ASCII_BIT_POS - 176 00000086 490D LDR R1, =DISPLAY_BIT - 177 00000088 6809 LDR R1, [R1] ARM Macro Assembler Page 5 - 178 0000008A 6001 STR R1, [R0] - 179 0000008C BC03 POP {R0, R1} - 180 0000008E 4770 BX LR - 181 00000090 - 182 00000090 ENDP - 183 00000090 ALIGN - 184 00000090 - 185 00000090 - 186 00000090 ; ------------------------------------------------------ + 179 00000084 2A28 CMP R2, #LCD_LAST_OFFSET ; until in + dex reached last lc + d point + 180 00000086 D4F8 BMI clear_lcd_loop + 181 00000088 BC07 POP {R0, R1, R2} + 182 0000008A 4770 BX LR + 183 0000008C + 184 0000008C write_bit_ascii + 185 0000008C B403 PUSH {R0, R1} + 186 0000008E 480E LDR R0, =ADDR_LCD_ASCII_BIT_POS + 187 00000090 490E LDR R1, =DISPLAY_BIT + 188 00000092 6809 LDR R1, [R1] + 189 00000094 6001 STR R1, [R0] + 190 00000096 BC03 POP {R0, R1} + 191 00000098 4770 BX LR + 192 0000009A + 193 0000009A ENDP + 194 0000009A 00 00 ALIGN + 195 0000009C + 196 0000009C + 197 0000009C ; ------------------------------------------------------ ------------ - 187 00000090 ; End of code - 188 00000090 ; ------------------------------------------------------ + 198 0000009C ; End of code + 199 0000009C ; ------------------------------------------------------ ------------ - 189 00000090 END + 200 0000009C END 60000210 00000001 60000200 60000340 00000004 0000FFFF + 60000114 00000000 00000002 - 60000114 + 60000100 60000300 60000302 00000000 @@ -333,7 +346,7 @@ Symbol: DISPLAY_BIT Definitions At line 56 in file app\struct_code.s Uses - At line 176 in file app\struct_code.s + At line 187 in file app\struct_code.s Comment: DISPLAY_BIT used once myConstants 00000000 @@ -350,55 +363,76 @@ Comment: myConstants unused ARM Macro Assembler Page 1 Alphabetic symbol ordering Relocatable symbols -case_blue 0000001E +case_blue 00000022 Symbol: case_blue Definitions - At line 102 in file app\struct_code.s + At line 105 in file app\struct_code.s Uses None Comment: case_blue unused -case_green 00000052 +case_green 0000003E Symbol: case_green Definitions - At line 138 in file app\struct_code.s + At line 129 in file app\struct_code.s Uses - At line 89 in file app\struct_code.s + At line 92 in file app\struct_code.s Comment: case_green used once -case_red 00000038 +case_red 00000030 Symbol: case_red Definitions - At line 120 in file app\struct_code.s + At line 117 in file app\struct_code.s Uses - At line 99 in file app\struct_code.s + At line 102 in file app\struct_code.s Comment: case_red used once -clear_lcd 0000006C +clear_lcd 00000076 Symbol: clear_lcd Definitions - At line 159 in file app\struct_code.s + At line 170 in file app\struct_code.s Uses At line 76 in file app\struct_code.s Comment: clear_lcd used once -clear_lcd_loop 00000070 +clear_lcd_colour 00000060 + +Symbol: clear_lcd_colour + Definitions + At line 157 in file app\struct_code.s + Uses + At line 82 in file app\struct_code.s +Comment: clear_lcd_colour used once +clear_lcd_loop 0000007A Symbol: clear_lcd_loop Definitions - At line 162 in file app\struct_code.s + At line 173 in file app\struct_code.s Uses - At line 169 in file app\struct_code.s + At line 180 in file app\struct_code.s Comment: clear_lcd_loop used once -end_cases 0000006A +end_led_loop 0000005A -Symbol: end_cases +Symbol: end_led_loop Definitions - At line 155 in file app\struct_code.s + At line 149 in file app\struct_code.s Uses - At line 119 in file app\struct_code.s - At line 137 in file app\struct_code.s + At line 144 in file app\struct_code.s +Comment: end_led_loop used once +led_loop 00000050 +Symbol: led_loop + + + +ARM Macro Assembler Page 2 Alphabetic symbol ordering +Relocatable symbols + + Definitions + At line 143 in file app\struct_code.s + Uses + At line 148 in file app\struct_code.s +Comment: led_loop used once main 00000000 Symbol: main @@ -409,18 +443,14 @@ Symbol: main Comment: main used once main_loop 00000008 - - - -ARM Macro Assembler Page 2 Alphabetic symbol ordering -Relocatable symbols - Symbol: main_loop Definitions At line 78 in file app\struct_code.s Uses - At line 157 in file app\struct_code.s -Comment: main_loop used once + At line 116 in file app\struct_code.s + At line 128 in file app\struct_code.s + At line 155 in file app\struct_code.s + myCode 00000000 Symbol: myCode @@ -429,15 +459,15 @@ Symbol: myCode Uses None Comment: myCode unused -write_bit_ascii 00000082 +write_bit_ascii 0000008C Symbol: write_bit_ascii Definitions - At line 173 in file app\struct_code.s + At line 184 in file app\struct_code.s Uses None Comment: write_bit_ascii unused -10 symbols +12 symbols @@ -450,9 +480,9 @@ Symbol: ADDR_7_SEG_BIN_DS3_0 Definitions At line 29 in file app\struct_code.s Uses - At line 116 in file app\struct_code.s - At line 134 in file app\struct_code.s - At line 152 in file app\struct_code.s + At line 113 in file app\struct_code.s + At line 125 in file app\struct_code.s + At line 137 in file app\struct_code.s ADDR_BUTTONS 60000210 @@ -460,7 +490,7 @@ Symbol: ADDR_BUTTONS Definitions At line 25 in file app\struct_code.s Uses - At line 85 in file app\struct_code.s + At line 88 in file app\struct_code.s Comment: ADDR_BUTTONS used once ADDR_DIP_SWITCH_7_0 60000200 @@ -468,7 +498,7 @@ Symbol: ADDR_DIP_SWITCH_7_0 Definitions At line 24 in file app\struct_code.s Uses - At line 94 in file app\struct_code.s + At line 97 in file app\struct_code.s Comment: ADDR_DIP_SWITCH_7_0 used once ADDR_LCD_ASCII 60000300 @@ -476,7 +506,7 @@ Symbol: ADDR_LCD_ASCII Definitions At line 31 in file app\struct_code.s Uses - At line 163 in file app\struct_code.s + At line 174 in file app\struct_code.s Comment: ADDR_LCD_ASCII used once ADDR_LCD_ASCII_2ND_LINE 60000314 @@ -492,7 +522,7 @@ Symbol: ADDR_LCD_ASCII_BIT_POS Definitions At line 32 in file app\struct_code.s Uses - At line 175 in file app\struct_code.s + At line 186 in file app\struct_code.s Comment: ADDR_LCD_ASCII_BIT_POS used once ADDR_LCD_COLOUR 60000340 @@ -500,15 +530,16 @@ Symbol: ADDR_LCD_COLOUR Definitions At line 30 in file app\struct_code.s Uses - At line 104 in file app\struct_code.s - At line 122 in file app\struct_code.s - At line 140 in file app\struct_code.s + At line 107 in file app\struct_code.s + At line 119 in file app\struct_code.s + At line 131 in file app\struct_code.s ARM Macro Assembler Page 2 Alphabetic symbol ordering Absolute symbols + At line 159 in file app\struct_code.s ADDR_LED_31_0 60000100 @@ -516,15 +547,15 @@ Symbol: ADDR_LED_31_0 Definitions At line 28 in file app\struct_code.s Uses - None -Comment: ADDR_LED_31_0 unused + At line 150 in file app\struct_code.s +Comment: ADDR_LED_31_0 used once ASCII_DIGIT_CLEAR 00000000 Symbol: ASCII_DIGIT_CLEAR Definitions At line 40 in file app\struct_code.s Uses - At line 165 in file app\struct_code.s + At line 176 in file app\struct_code.s Comment: ASCII_DIGIT_CLEAR used once ASCII_DIGIT_OFFSET 00000030 @@ -540,9 +571,8 @@ Symbol: DISPLAY_COLOUR_BLUE Definitions At line 49 in file app\struct_code.s Uses - At line 105 in file app\struct_code.s - At line 126 in file app\struct_code.s - At line 147 in file app\struct_code.s + At line 108 in file app\struct_code.s + At line 163 in file app\struct_code.s DISPLAY_COLOUR_GREEN 00000002 @@ -550,9 +580,8 @@ Symbol: DISPLAY_COLOUR_GREEN Definitions At line 48 in file app\struct_code.s Uses - At line 111 in file app\struct_code.s - At line 129 in file app\struct_code.s - At line 141 in file app\struct_code.s + At line 132 in file app\struct_code.s + At line 165 in file app\struct_code.s DISPLAY_COLOUR_RED 00000000 @@ -560,23 +589,22 @@ Symbol: DISPLAY_COLOUR_RED Definitions At line 47 in file app\struct_code.s Uses - At line 108 in file app\struct_code.s - At line 123 in file app\struct_code.s - At line 144 in file app\struct_code.s + At line 120 in file app\struct_code.s + At line 161 in file app\struct_code.s LCD_LAST_OFFSET 00000028 Symbol: LCD_LAST_OFFSET Definitions + At line 41 in file app\struct_code.s + Uses ARM Macro Assembler Page 3 Alphabetic symbol ordering Absolute symbols - At line 41 in file app\struct_code.s - Uses - At line 168 in file app\struct_code.s + At line 179 in file app\struct_code.s Comment: LCD_LAST_OFFSET used once 14 symbols @@ -591,7 +619,7 @@ Symbol: adc_get_value Definitions At line 70 in file app\struct_code.s Uses - At line 82 in file app\struct_code.s + At line 85 in file app\struct_code.s Comment: adc_get_value used once adc_init 00000000 @@ -602,4 +630,4 @@ Symbol: adc_init At line 75 in file app\struct_code.s Comment: adc_init used once 2 symbols -366 symbols in table +368 symbols in table diff --git a/project/build/struct_code.o b/project/build/struct_code.o index c592aed01c933cd4682f383ba9c6be2a0d3c89ac..a150a507c0b481e045401a1690e351f0eed96f6c 100644 GIT binary patch delta 989 zcmZ8fKWGzS6o21+F}cK;=9(+UyCyWDLo5zTg(^6dw9;Hs7dr_ZuA73Ej1EFFIY@_= z8-yS(&Q8Xyf`fyDLqrEb-3l3Wa1e|R#@~B)XPW-V_x}9e%X{B@_kAjSFYGU<^@Ga! z&dP{>ERDv${*J3&`hK-()vfnzWt`;aN~^M2y;0h#ww(62VF_LtUK!re&}o%7U3hM* z*mga;`P$TjgH>y->--s>YbgK2Fx9sjcGLFiH}g0JoYY}^Bh{a2&NjNmoTvQRQf+%_ z^pR=Z&oy#h`nK{lJfgfoz9Im6Rg<59IUW<)iu{mGghnQ5Xu zNwS4A;w-KrDAHTes@nI?S15 z_7T9`SL3)8Mb)e!>$r=F1n6g2uuSQ=6_SU@3ofP3c9bC%uQR<6#<=+#?C2YwU75s2wdx_2+-9wKxwL$m}2QI{|B-pXmtPp delta 968 zcmZ8fy-OTX5TCbibMAS2dUu=Px_9TT;6V(6B7!MWT@t)=HoK`d6b z2v`X=mV(+Tn9e4UK#D+8ToFi<)Uk@0nYYiqWZ=!mZ$5Wse>z{B#1{(()3g1>+q>U? z?)+YH+h47Anx9A;_3W>$pcVSBnrnX8Lf#6ehzDNm4&0y~PNFrzd@`Is-9=AnPzxS~ z4q8rFLp~l>k=Ft@{_tbud~CJS-F5Arh-%HpPi{YtT*fQ%+%9#?z2X}YNi+`z?kpe~ z_#O&~Ktg2TBaCQt9Ka$u25_0S#f6hFjv1S;*SA*)B$Xr_n8o=DQRTtU7mpI7&>qJ#omWnHe*_c9R4S=o$a{~d#Z`7`7+*nebznIYMn zD*8GPs}xXw0T^e3;1c_k_UIYMJkrQxrbCAW$tJ+D`rtBzydMz zyUi0C!wKXN^yx^k5_k?$I95%j`xii!wJbUsz{U~43CFQX-(j1|1+bD-E97Tpesl7ceMff~sZ)Y*=;!`wsQFV-Si AfB*mh diff --git a/project/build/strukt_code.axf b/project/build/strukt_code.axf index 013b9780bcfe15b68f76b7682a022fb92a33ff2f..259d8ec44da010a6095b730050114cc171c2c28c 100644 GIT binary patch delta 536 zcmY+AF-Rjp6o%jI8WTm6-58HJn*=v0BDoaGMZD_J2zZV6Wn^Ic`QjFc;PgZDwbZZ4RR<8py_^|baxO{)FD0slxaNmCakKe_R7Q9ZK z7;b-?7AYU`Sj;#zr(QQh3=tiGB!EEx3(sy5j2dh!6#x$b<26R|9%lk7Y7R*|cCz;0 zdmZU0yTGBk@$T%mAHQG{-7Sh=+ZO?9V4@aDMpb|Y_=nszL%sQCvdC`6;-A_mR)G3Y z6sh>$9h543u24VE-^%FEz`<9Gm=#~rLb{3M&0_krv2hIp zw?M$<0*IM~&5s{!F$v%^BUT@YG2IH0pKR6&BUh12%tEfSq7}BCeFfNIaxO%cS!XUx irr8uS#eO5(**0>K9V0i`V=nBS%L4qxWz~B5S~SlWhKI)h delta 532 zcmY+Bze^io7{{OY?rdVcG?&xpd0tF{krN$^c6U&)#(N8;#X%Y&LWeq7(oI1~I@K}o zIOsnhC@7S3%vtSP3R=23=pv=yVwal5_WKqx_ksMwj2(Yqh9X7!nVWOmIZ zN}X>-MTh00<)jJH5Iuq_q*Fyhc;T{j7!!@qa(<6a+$1TUw=rvVdF36I;Z#Mf`=S#W z^!gDf7V>x~?SKd2)0wlh*kogIdfbHuT@TTg=MH%790LzbCR|_qI+begPbAQYJYLwY z4SN>F)v-Ei*QyF{pjUHl(W{%Cgstt%M4|y}Yl4zVqC$ARJJy>hSVSX5q8L#<&iTma zVq|cA%U~H6% diff --git a/project/build/strukt_code.build_log.htm b/project/build/strukt_code.build_log.htm index aa3df84..f497fb2 100644 --- a/project/build/strukt_code.build_log.htm +++ b/project/build/strukt_code.build_log.htm @@ -28,8 +28,10 @@ Project File Date: 11/11/2022 *** Using Compiler 'V6.18', folder: 'C:\Keil_v5\ARM\ARMCLANG\Bin' Rebuild target 'Target 1' assembling datainit_ctboard.s... -assembling startup_ctboard.s... assembling struct_code.s... +assembling startup_ctboard.s... +compiling hal_fmc.c... +compiling system_ctboard.c... app/adc.c(39): warning: logical not is only applied to the left hand side of this bitwise operator [-Wlogical-not-parentheses] while (!ADC3->SR & 0x00000002) ; ^ ~ @@ -43,13 +45,11 @@ app/adc.c(39): note: add parentheses around left hand side expression to silence ( ) 1 warning generated. compiling adc.c... -compiling system_ctboard.c... -compiling hal_fmc.c... compiling hal_pwr.c... -compiling hal_rcc.c... compiling hal_gpio.c... +compiling hal_rcc.c... linking... -Program Size: Code=3696 RO-data=436 RW-data=0 ZI-data=8192 +Program Size: Code=3712 RO-data=436 RW-data=0 ZI-data=8192 ".\build\strukt_code.axf" - 0 Error(s), 1 Warning(s).

Software Packages used:

@@ -73,37 +73,37 @@ Package Vendor: InES

Collection of Component Files used:

* Component: InES::Device:Startup:4.0.1 + Include file: Device/Include/reg_ctboard.h Include file: Device/Include/m0/platform_ctboard.h Include file: Device/Include/reg_stm32f4xx.h - Include file: Device/Include/reg_ctboard.h Include file: Device/Include/system_ctboard.h - Source file: Device/Source/system_ctboard.c Source file: Device/Source/startup_ctboard.s + Source file: Device/Source/system_ctboard.c Source file: Device/Source/datainit_ctboard.s * Component: InES::HAL:FMC:3.0.1 - Include file: HAL/Include/hal_common.h Include file: Device/Include/reg_stm32f4xx.h + Include file: HAL/Include/hal_common.h Source file: HAL/Source/hal_fmc.c Include file: HAL/Include/hal_fmc.h * Component: InES::HAL:GPIO:4.0.1 Source file: HAL/Source/hal_gpio.c - Include file: HAL/Include/hal_common.h Include file: Device/Include/reg_stm32f4xx.h Include file: HAL/Include/hal_gpio.h + Include file: HAL/Include/hal_common.h * Component: InES::HAL:PWR:2.2.0 Include file: HAL/Include/hal_common.h - Include file: Device/Include/reg_stm32f4xx.h Include file: HAL/Include/hal_pwr.h Source file: HAL/Source/hal_pwr.c + Include file: Device/Include/reg_stm32f4xx.h * Component: InES::HAL:RCC:4.0.1 - Source file: HAL/Source/hal_rcc.c Include file: HAL/Include/hal_common.h - Include file: Device/Include/reg_stm32f4xx.h Include file: HAL/Include/hal_rcc.h + Include file: Device/Include/reg_stm32f4xx.h + Source file: HAL/Source/hal_rcc.c Build Time Elapsed: 00:00:00 diff --git a/project/build/strukt_code.htm b/project/build/strukt_code.htm index 439ec5b..69a2db8 100644 --- a/project/build/strukt_code.htm +++ b/project/build/strukt_code.htm @@ -3,7 +3,7 @@ Static Call Graph - [.\build\strukt_code.axf]

Static Call Graph for image .\build\strukt_code.axf

-

#<CALLGRAPH># ARM Linker, 6180002: Last Updated: Fri Nov 11 09:07:05 2022 +

#<CALLGRAPH># ARM Linker, 6180002: Last Updated: Fri Nov 11 09:44:15 2022

Maximum Stack Usage = 132 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

@@ -606,7 +606,7 @@ Global Symbols
[Called By]
  • >>   system_enter_run
-

main (Thumb, 144 bytes, Stack size 0 bytes, struct_code.o(myCode)) +

main (Thumb, 154 bytes, Stack size 0 bytes, struct_code.o(myCode))

[Stack]

  • Max Depth = 16
  • Call Chain = main ⇒ adc_init

[Calls]
  • >>   adc_get_value diff --git a/project/build/strukt_code.map b/project/build/strukt_code.map index 64d34f0..250d73b 100644 --- a/project/build/strukt_code.map +++ b/project/build/strukt_code.map @@ -135,9 +135,9 @@ Image Symbol Table __arm_cp.3_5 0x08000f00 Number 4 hal_rcc.o(.text) __arm_cp.4_0 0x08000f54 Number 4 hal_rcc.o(.text) __arm_cp.4_1 0x08000f58 Number 4 hal_rcc.o(.text) - myCode 0x08000f5c Section 192 struct_code.o(myCode) - DISPLAY_BIT 0x0800101c Data 4 struct_code.o(myConstants) - myConstants 0x0800101c Section 8 struct_code.o(myConstants) + myCode 0x08000f5c Section 208 struct_code.o(myCode) + DISPLAY_BIT 0x0800102c Data 4 struct_code.o(myConstants) + myConstants 0x0800102c Section 8 struct_code.o(myConstants) STACK 0x20000000 Section 8192 startup_ctboard.o(STACK) __initial_sp 0x20002000 Data 0 startup_ctboard.o(STACK) @@ -291,8 +291,8 @@ Image Symbol Table hal_rcc_set_osc 0x08000d9d Thumb Code 108 hal_rcc.o(.text) hal_rcc_setup_pll 0x08000e11 Thumb Code 220 hal_rcc.o(.text) hal_rcc_setup_clock 0x08000f05 Thumb Code 80 hal_rcc.o(.text) - main 0x08000f5d Thumb Code 144 struct_code.o(myCode) - Image$$RO$$Limit 0x08001024 Number 0 anon$$obj.o ABSOLUTE + main 0x08000f5d Thumb Code 154 struct_code.o(myCode) + Image$$RO$$Limit 0x08001034 Number 0 anon$$obj.o ABSOLUTE Image$$RW$$Base 0x20000000 Number 0 anon$$obj.o ABSOLUTE Image$$ZI$$Base 0x20000000 Number 0 anon$$obj.o ABSOLUTE Stack_Mem 0x20000000 Data 8192 startup_ctboard.o(STACK) @@ -306,9 +306,9 @@ Memory Map of the image Image Entry point : 0x080002a1 - Load Region LR_1 (Base: 0x08000000, Size: 0x00001024, Max: 0xffffffff, ABSOLUTE) + Load Region LR_1 (Base: 0x08000000, Size: 0x00001034, Max: 0xffffffff, ABSOLUTE) - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00001024, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00001034, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -322,16 +322,16 @@ Memory Map of the image 0x0800057c 0x0800057c 0x00000604 Code RO 42 .text hal_gpio.o 0x08000b80 0x08000b80 0x000000ac Code RO 50 .text hal_pwr.o 0x08000c2c 0x08000c2c 0x00000330 Code RO 58 .text hal_rcc.o - 0x08000f5c 0x08000f5c 0x000000c0 Code RO 9 * myCode struct_code.o - 0x0800101c 0x0800101c 0x00000008 Data RO 8 myConstants struct_code.o + 0x08000f5c 0x08000f5c 0x000000d0 Code RO 9 * myCode struct_code.o + 0x0800102c 0x0800102c 0x00000008 Data RO 8 myConstants struct_code.o - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08001024, Size: 0x00000000, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08001034, Size: 0x00000000, Max: 0xffffffff, ABSOLUTE) **** No section assigned to this execution region **** - Execution Region ER_ZI (Exec base: 0x20000000, Load base: 0x08001024, Size: 0x00002000, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_ZI (Exec base: 0x20000000, Load base: 0x08001034, Size: 0x00002000, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -352,11 +352,11 @@ Image component sizes 172 20 0 0 0 2135 hal_pwr.o 816 168 0 0 0 5363 hal_rcc.o 36 8 428 0 8192 832 startup_ctboard.o - 192 48 8 0 0 440 struct_code.o + 208 54 8 0 0 444 struct_code.o 354 60 0 0 0 6774 system_ctboard.o ---------------------------------------------------------------------- - 3696 482 436 0 8192 33995 Object Totals + 3712 488 436 0 8192 33999 Object Totals 0 0 0 0 0 0 (incl. Generated) 2 0 0 0 0 0 (incl. Padding) @@ -371,15 +371,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 3696 482 436 0 8192 33791 Grand Totals - 3696 482 436 0 8192 33791 ELF Image Totals - 3696 482 436 0 0 0 ROM Totals + 3712 488 436 0 8192 33795 Grand Totals + 3712 488 436 0 8192 33795 ELF Image Totals + 3712 488 436 0 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 4132 ( 4.04kB) + Total RO Size (Code + RO Data) 4148 ( 4.05kB) Total RW Size (RW Data + ZI Data) 8192 ( 8.00kB) - Total ROM Size (Code + RO Data + RW Data) 4132 ( 4.04kB) + Total ROM Size (Code + RO Data + RW Data) 4148 ( 4.05kB) ============================================================================== diff --git a/project/build/strukt_code_Target 1.dep b/project/build/strukt_code_Target 1.dep index 462e1dd..9b46faa 100644 --- a/project/build/strukt_code_Target 1.dep +++ b/project/build/strukt_code_Target 1.dep @@ -3,7 +3,7 @@ CompilerVersion: 6180000::V6.18::ARMCLANG F (.\app\adc.c)(0x636DF2E9)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__EVAL -gdwarf-4 -O1 -fno-function-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I./RTE/_Target_1 -IC:/Users/roman/AppData/Local/Arm/Packs/InES/CTBoard14_DFP/4.0.2/Device/Include -IC:/Users/roman/AppData/Local/Arm/Packs/InES/CTBoard14_DFP/4.0.2/Device/Include/m0 -IC:/Users/roman/AppData/Local/Arm/Packs/InES/CTBoard14_DFP/4.0.2/HAL/Include -D__UVISION_VERSION="537" -D_RTE_ -D_RTE_ -o ./build/adc.o -MD) I (C:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\Device\Include\reg_stm32f4xx.h)(0x5C597514) I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6252B538) -F (.\app\struct_code.s)(0x636E0271)(--cpu Cortex-M0 --pd "__EVAL SETA 1" -g -I.\RTE\_Target_1 -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\Device\Include -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\Device\Include\m0 -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\HAL\Include --pd "__UVISION_VERSION SETA 537" --pd "_RTE_ SETA 1" --pd "_RTE_ SETA 1" --list .\build\struct_code.lst --xref -o .\build\struct_code.o --depend .\build\struct_code.d) +F (.\app\struct_code.s)(0x636E0B5A)(--cpu Cortex-M0 --pd "__EVAL SETA 1" -g -I.\RTE\_Target_1 -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\Device\Include -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\Device\Include\m0 -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\HAL\Include --pd "__UVISION_VERSION SETA 537" --pd "_RTE_ SETA 1" --pd "_RTE_ SETA 1" --list .\build\struct_code.lst --xref -o .\build\struct_code.o --depend .\build\struct_code.d) F (RTE/Device/CT_Board_HS14_M0/datainit_ctboard.s)(0x5C517478)(--cpu Cortex-M0 --pd "__EVAL SETA 1" -g -I.\RTE\_Target_1 -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\Device\Include -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\Device\Include\m0 -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\HAL\Include --pd "__UVISION_VERSION SETA 537" --pd "_RTE_ SETA 1" --pd "_RTE_ SETA 1" --list .\build\datainit_ctboard.lst --xref -o .\build\datainit_ctboard.o --depend .\build\datainit_ctboard.d) F (RTE/Device/CT_Board_HS14_M0/startup_ctboard.s)(0x5C517478)(--cpu Cortex-M0 --pd "__EVAL SETA 1" -g -I.\RTE\_Target_1 -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\Device\Include -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\Device\Include\m0 -IC:\Users\roman\AppData\Local\Arm\Packs\InES\CTBoard14_DFP\4.0.2\HAL\Include --pd "__UVISION_VERSION SETA 537" --pd "_RTE_ SETA 1" --pd "_RTE_ SETA 1" --list .\build\startup_ctboard.lst --xref -o .\build\startup_ctboard.o --depend .\build\startup_ctboard.d) F (RTE/Device/CT_Board_HS14_M0/system_ctboard.c)(0x5C597514)(-xc -std=c99 --target=arm-arm-none-eabi -mcpu=cortex-m0 -c -fno-rtti -funsigned-char -D__EVAL -gdwarf-4 -O1 -fno-function-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I./RTE/_Target_1 -IC:/Users/roman/AppData/Local/Arm/Packs/InES/CTBoard14_DFP/4.0.2/Device/Include -IC:/Users/roman/AppData/Local/Arm/Packs/InES/CTBoard14_DFP/4.0.2/Device/Include/m0 -IC:/Users/roman/AppData/Local/Arm/Packs/InES/CTBoard14_DFP/4.0.2/HAL/Include -D__UVISION_VERSION="537" -D_RTE_ -D_RTE_ -o ./build/system_ctboard.o -MD) diff --git a/project/strukt_code.uvguix.roman b/project/strukt_code.uvguix.roman index fd61f87..14691b6 100644 --- a/project/strukt_code.uvguix.roman +++ b/project/strukt_code.uvguix.roman @@ -15,17 +15,17 @@ 38003 Registers - 140 90 + 140 100 346 Code Coverage - 1010 160 + 1010 656 204 Performance Analyzer - 1170 + 352 175 175 964 @@ -34,7 +34,7 @@ 35141 Event Statistics - 200 50 700 + 250 50 874 1506 @@ -70,7 +70,7 @@ 466 Source Browser 500 - 300 + 166 @@ -1806,7 +1806,7 @@ File 2705 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000004626C75659600000000000000110004626C7565026278044C534C53024C52034245510252310373756D0366343003504144045573657304414444520A616464725F6469705F73053230303030064D79436F6465034551550B636F6E73745F7461626C650A307830383030306634300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000004626C75659600000000000000110004626C7565026278044C534C53024C52034245510252310373756D0366343003504144045573657304414444520A616464725F6469705F73053230303030064D79436F6465034551550B636F6E73745F7461626C650A307830383030306634300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 976 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000008546172676574203196000000000000000100085461726765742031000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3547,7 +3547,7 @@ File 2705 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000004626C75659600000000000000110004626C7565026278044C534C53024C52034245510252310373756D0366343003504144045573657304414444520A616464725F6469705F73053230303030064D79436F6465034551550B636F6E73745F7461626C650A307830383030306634300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000000180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000004626C75659600000000000000110004626C7565026278044C534C53024C52034245510252310373756D0366343003504144045573657304414444520A616464725F6469705F73053230303030064D79436F6465034551550B636F6E73745F7461626C650A307830383030306634300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3606,9 +3606,9 @@ 0 .\app\struct_code.s - 2 - 136 - 155 + 12 + 132 + 151 1 0 diff --git a/project/strukt_code.uvoptx b/project/strukt_code.uvoptx index 072a976..7a6107b 100644 --- a/project/strukt_code.uvoptx +++ b/project/strukt_code.uvoptx @@ -148,24 +148,7 @@ UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_2048 -FS08000000 -FL0200000 -FP0($$Device:CT_Board_HS14_M0$Flash\STM32F4xx_2048.FLM)) - - - 0 - 0 - 87 - 1 -
    134221676
    - 0 - 0 - 0 - 0 - 0 - 1 - .\app\struct_code.s - - \\strukt_code\app/struct_code.s\87 -     -     + 0