diff --git a/Debug/MyProject.axf b/Debug/MyProject.axf index 3df48ad..1a223fa 100755 Binary files a/Debug/MyProject.axf and b/Debug/MyProject.axf differ diff --git a/Debug/MyProject.map b/Debug/MyProject.map index f6698db..51e1790 100644 --- a/Debug/MyProject.map +++ b/Debug/MyProject.map @@ -663,7 +663,7 @@ END GROUP 0x20084000 __top_RamAHB32 = 0x20084000 0x20084000 __top_RAM2 = 0x20084000 -.text 0x00000000 0x3ad38 +.text 0x00000000 0x3acd4 FILL mask 0xff 0x00000000 __vectors_start__ = ABSOLUTE (.) *(.isr_vector) @@ -672,10 +672,10 @@ END GROUP 0x000000cc . = ALIGN (0x4) 0x000000cc __section_table_start = . 0x000000cc __data_section_table = . - 0x000000cc 0x4 LONG 0x3ad38 LOADADDR (.data) + 0x000000cc 0x4 LONG 0x3acd4 LOADADDR (.data) 0x000000d0 0x4 LONG 0x10000000 ADDR (.data) 0x000000d4 0x4 LONG 0x1c SIZEOF (.data) - 0x000000d8 0x4 LONG 0x3ad38 LOADADDR (.data_RAM2) + 0x000000d8 0x4 LONG 0x3acd4 LOADADDR (.data_RAM2) 0x000000dc 0x4 LONG 0x2007c000 ADDR (.data_RAM2) 0x000000e0 0x4 LONG 0x0 SIZEOF (.data_RAM2) 0x000000e4 __data_section_table_end = . @@ -819,108 +819,108 @@ END GROUP 0x00000b3e 0xa6 ./src/SPI.o 0x00000b3e Refresh_Area .text.Refresh_Player_Area - 0x00000be4 0x32c ./src/SPI.o + 0x00000be4 0x2c8 ./src/SPI.o 0x00000be4 Refresh_Player_Area .text.Draw_stars - 0x00000f10 0x64 ./src/SPI.o - 0x00000f10 Draw_stars - .text.strLen 0x00000f74 0x3a ./src/SPI.o - 0x00000f74 strLen - *fill* 0x00000fae 0x2 ff + 0x00000eac 0x64 ./src/SPI.o + 0x00000eac Draw_stars + .text.strLen 0x00000f10 0x3a ./src/SPI.o + 0x00000f10 strLen + *fill* 0x00000f4a 0x2 ff .text.DrawChar - 0x00000fb0 0x108 ./src/SPI.o - 0x00000fb0 DrawChar + 0x00000f4c 0x108 ./src/SPI.o + 0x00000f4c DrawChar .text.DrawText - 0x000010b8 0x8c ./src/SPI.o - 0x000010b8 DrawText + 0x00001054 0x8c ./src/SPI.o + 0x00001054 DrawText .text.SystemInit - 0x00001144 0x144 ./src/init_clk.o - 0x00001144 SystemInit - .text.init 0x00001288 0xc ./src/main.o - 0x00001288 init + 0x000010e0 0x144 ./src/init_clk.o + 0x000010e0 SystemInit + .text.init 0x00001224 0xc ./src/main.o + 0x00001224 init .text.TIMER0_IRQHandler - 0x00001294 0x24 ./src/main.o - 0x00001294 TIMER0_IRQHandler + 0x00001230 0x24 ./src/main.o + 0x00001230 TIMER0_IRQHandler .text.EINT3_IRQHandler - 0x000012b8 0x18 ./src/main.o - 0x000012b8 EINT3_IRQHandler + 0x00001254 0x18 ./src/main.o + 0x00001254 EINT3_IRQHandler .text.increment_scroll - 0x000012d0 0x44 ./src/main.o - 0x000012d0 increment_scroll + 0x0000126c 0x44 ./src/main.o + 0x0000126c increment_scroll .text.SysTick_Handler - 0x00001314 0x48 ./src/main.o - 0x00001314 SysTick_Handler + 0x000012b0 0x48 ./src/main.o + 0x000012b0 SysTick_Handler .text.number_of_digits - 0x0000135c 0x40 ./src/main.o - 0x0000135c number_of_digits + 0x000012f8 0x40 ./src/main.o + 0x000012f8 number_of_digits .text.convert_to_string - 0x0000139c 0x7c ./src/main.o - 0x0000139c convert_to_string + 0x00001338 0x7c ./src/main.o + 0x00001338 convert_to_string .text.CreatePlayer - 0x00001418 0x9c ./src/main.o - 0x00001418 CreatePlayer - .text.min 0x000014b4 0x22 ./src/main.o - 0x000014b4 min - *fill* 0x000014d6 0x2 ff + 0x000013b4 0x9c ./src/main.o + 0x000013b4 CreatePlayer + .text.min 0x00001450 0x22 ./src/main.o + 0x00001450 min + *fill* 0x00001472 0x2 ff .text.RefreshPlayer - 0x000014d8 0x148 ./src/main.o - 0x000014d8 RefreshPlayer - .text.main 0x00001620 0x214 ./src/main.o - 0x00001620 main - .text.memcpy 0x00001834 0x4 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(memcpy.o) - 0x00001834 memcpy + 0x00001474 0x148 ./src/main.o + 0x00001474 RefreshPlayer + .text.main 0x000015bc 0x214 ./src/main.o + 0x000015bc main + .text.memcpy 0x000017d0 0x4 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(memcpy.o) + 0x000017d0 memcpy .text.__weak_main - 0x00001838 0x4 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) - 0x00001838 __main - 0x00001838 __weak_main - .text.abs 0x0000183c 0x8 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) - 0x0000183c abs + 0x000017d4 0x4 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) + 0x000017d4 __main + 0x000017d4 __weak_main + .text.abs 0x000017d8 0x8 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) + 0x000017d8 abs .text.__aeabi_memcpy - 0x00001844 0x34 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/thumb/v7-m/nofp/libcr_eabihelpers.a(memcpy.o) - 0x00001844 __aeabi_memcpy - 0x0000184e __aeabi_memcpy4 - 0x0000184e __aeabi_memcpy8 + 0x000017e0 0x34 /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/thumb/v7-m/nofp/libcr_eabihelpers.a(memcpy.o) + 0x000017e0 __aeabi_memcpy + 0x000017ea __aeabi_memcpy4 + 0x000017ea __aeabi_memcpy8 *(.rodata .rodata.* .constdata .constdata.*) - .rodata.SMPTE 0x00001878 0x38410 ./src/SPI.o + .rodata.SMPTE 0x00001814 0x38410 ./src/SPI.o .rodata.ShipSprite1 - 0x00039c88 0xc10 ./src/SPI.o + 0x00039c24 0xc10 ./src/SPI.o .rodata.SmallFont - 0x0003a898 0x478 ./src/fonts.o - 0x0003a898 SmallFont + 0x0003a834 0x478 ./src/fonts.o + 0x0003a834 SmallFont .rodata.SCREEN - 0x0003ad10 0x10 ./src/main.o - 0x0003ad10 SCREEN - .rodata 0x0003ad20 0x18 ./src/main.o - 0x0003ad38 . = ALIGN (0x4) + 0x0003acac 0x10 ./src/main.o + 0x0003acac SCREEN + .rodata 0x0003acbc 0x18 ./src/main.o + 0x0003acd4 . = ALIGN (0x4) -.glue_7 0x0003ad38 0x0 - .glue_7 0x0003ad38 0x0 linker stubs +.glue_7 0x0003acd4 0x0 + .glue_7 0x0003acd4 0x0 linker stubs -.glue_7t 0x0003ad38 0x0 - .glue_7t 0x0003ad38 0x0 linker stubs +.glue_7t 0x0003acd4 0x0 + .glue_7t 0x0003acd4 0x0 linker stubs -.vfp11_veneer 0x0003ad38 0x0 - .vfp11_veneer 0x0003ad38 0x0 linker stubs +.vfp11_veneer 0x0003acd4 0x0 + .vfp11_veneer 0x0003acd4 0x0 linker stubs -.v4_bx 0x0003ad38 0x0 - .v4_bx 0x0003ad38 0x0 linker stubs +.v4_bx 0x0003acd4 0x0 + .v4_bx 0x0003acd4 0x0 linker stubs -.iplt 0x0003ad38 0x0 - .iplt 0x0003ad38 0x0 ./src/SPI.o +.iplt 0x0003acd4 0x0 + .iplt 0x0003acd4 0x0 ./src/SPI.o -.rel.dyn 0x0003ad38 0x0 - .rel.iplt 0x0003ad38 0x0 ./src/SPI.o +.rel.dyn 0x0003acd4 0x0 + .rel.iplt 0x0003acd4 0x0 ./src/SPI.o .ARM.extab *(.ARM.extab* .gnu.linkonce.armextab.*) -.ARM.exidx 0x0003ad38 0x0 - 0x0003ad38 __exidx_start = . +.ARM.exidx 0x0003acd4 0x0 + 0x0003acd4 __exidx_start = . *(.ARM.exidx* .gnu.linkonce.armexidx.*) - 0x0003ad38 __exidx_end = . - 0x0003ad38 _etext = . + 0x0003acd4 __exidx_end = . + 0x0003acd4 _etext = . -.data_RAM2 0x2007c000 0x0 load address 0x0003ad38 +.data_RAM2 0x2007c000 0x0 load address 0x0003acd4 FILL mask 0xff [!provide] PROVIDE (__start_data_RAM2 = .) [!provide] PROVIDE (__start_data_RamAHB32 = .) @@ -941,7 +941,7 @@ END GROUP 0x10000000 . = ALIGN (0x4) 0x10000000 _end_uninit_RESERVED = . -.data 0x10000000 0x1c load address 0x0003ad38 +.data 0x10000000 0x1c load address 0x0003acd4 FILL mask 0xff 0x10000000 _data = . [!provide] PROVIDE (__start_data_RAM = .) @@ -969,7 +969,7 @@ END GROUP [!provide] PROVIDE (__end_data_RAM = .) [!provide] PROVIDE (__end_data_RamLoc32 = .) -.igot.plt 0x1000001c 0x0 load address 0x0003ad54 +.igot.plt 0x1000001c 0x0 load address 0x0003acf0 .igot.plt 0x1000001c 0x0 ./src/SPI.o .bss_RAM2 0x2007c000 0x0 @@ -1031,8 +1031,8 @@ END GROUP 0x10008000 PROVIDE (_vStackTop = DEFINED (__user_stack_top)?__user_stack_top:(__top_RamLoc32 - 0x0)) 0xefff74b2 PROVIDE (__valid_user_code_checksum = (0x0 - ((((((_vStackTop + (ResetISR + 0x1)) + (NMI_Handler + 0x1)) + (HardFault_Handler + 0x1)) + (DEFINED (MemManage_Handler)?MemManage_Handler:0x0 + 0x1)) + (DEFINED (BusFault_Handler)?BusFault_Handler:0x0 + 0x1)) + (DEFINED (UsageFault_Handler)?UsageFault_Handler:0x0 + 0x1)))) 0x00000000 _image_start = LOADADDR (.text) - 0x0003ad54 _image_end = (LOADADDR (.data) + SIZEOF (.data)) - 0x0003ad54 _image_size = (_image_end - _image_start) + 0x0003acf0 _image_end = (LOADADDR (.data) + SIZEOF (.data)) + 0x0003acf0 _image_size = (_image_end - _image_start) OUTPUT(MyProject.axf elf32-littlearm) LOAD linker stubs @@ -1110,17 +1110,17 @@ LOAD linker stubs .debug_macro 0x000015f3 0x6b ./src/main.o .debug_macro 0x0000165e 0xc4 ./src/main.o -.debug_line 0x00000000 0x1de2 +.debug_line 0x00000000 0x1daa .debug_line 0x00000000 0x358 ./src/GPIO.o - .debug_line 0x00000358 0xa63 ./src/SPI.o - .debug_line 0x00000dbb 0x161 ./src/cr_startup_lpc175x_6x.o - .debug_line 0x00000f1c 0xb9 ./src/crp.o - .debug_line 0x00000fd5 0x3a ./src/fonts.o - .debug_line 0x0000100f 0x3c8 ./src/init_clk.o - .debug_line 0x000013d7 0x5e7 ./src/main.o - .debug_line 0x000019be 0x9b /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(memcpy.o) - .debug_line 0x00001a59 0x4a /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) - .debug_line 0x00001aa3 0x33f /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) + .debug_line 0x00000358 0xa2b ./src/SPI.o + .debug_line 0x00000d83 0x161 ./src/cr_startup_lpc175x_6x.o + .debug_line 0x00000ee4 0xb9 ./src/crp.o + .debug_line 0x00000f9d 0x3a ./src/fonts.o + .debug_line 0x00000fd7 0x3c8 ./src/init_clk.o + .debug_line 0x0000139f 0x5e7 ./src/main.o + .debug_line 0x00001986 0x9b /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(memcpy.o) + .debug_line 0x00001a21 0x4a /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(__weak__main.o) + .debug_line 0x00001a6b 0x33f /Applications/MCUXpressoIDE_11.9.0_2144/ide/plugins/com.nxp.mcuxpresso.tools.macosx_11.9.0.202307121226/tools/bin/../lib/gcc/arm-none-eabi/12.3.1/../../../../arm-none-eabi/lib/thumb/v7-m/nofp/libcr_c.a(stdlib.o) .debug_str 0x00000000 0x6400 .debug_str 0x00000000 0x5145 ./src/GPIO.o diff --git a/Debug/MyProject_Debug.ld b/Debug/MyProject_Debug.ld index b2d3651..ee65b69 100644 --- a/Debug/MyProject_Debug.ld +++ b/Debug/MyProject_Debug.ld @@ -5,7 +5,7 @@ * Generated linker script file for LPC1769 * Created from linkscript.ldt by FMCreateLinkLibraries * Using Freemarker v2.3.30 - * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 13, 2024, 9:19:10 PM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 13, 2024, 9:21:46 PM */ INCLUDE "MyProject_Debug_library.ld" diff --git a/Debug/MyProject_Debug_library.ld b/Debug/MyProject_Debug_library.ld index 77c8069..4e56e85 100644 --- a/Debug/MyProject_Debug_library.ld +++ b/Debug/MyProject_Debug_library.ld @@ -5,7 +5,7 @@ * Generated linker script file for LPC1769 * Created from library.ldt by FMCreateLinkLibraries * Using Freemarker v2.3.30 - * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 13, 2024, 9:19:10 PM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 13, 2024, 9:21:46 PM */ GROUP ( diff --git a/Debug/MyProject_Debug_memory.ld b/Debug/MyProject_Debug_memory.ld index a5ab194..c69d938 100644 --- a/Debug/MyProject_Debug_memory.ld +++ b/Debug/MyProject_Debug_memory.ld @@ -5,7 +5,7 @@ * Generated linker script file for LPC1769 * Created from memory.ldt by FMCreateLinkMemory * Using Freemarker v2.3.30 - * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 13, 2024, 9:19:10 PM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 13, 2024, 9:21:46 PM */ MEMORY diff --git a/Debug/src/SPI.o b/Debug/src/SPI.o index 73a5f91..098d05a 100644 Binary files a/Debug/src/SPI.o and b/Debug/src/SPI.o differ diff --git a/src/SPI.c b/src/SPI.c index b65c1c0..b0f1c23 100644 --- a/src/SPI.c +++ b/src/SPI.c @@ -313,8 +313,8 @@ void Refresh_Player_Area(Rectangle area,Rectangle Hitbox){ Get_Color_From_Background((Point){area.Position.X+x,(area.Position.Y+y)%SCREEN_HEIGHT},&color); }else{ Get_Color_From_Background((Point){area.Position.X+x,(area.Position.Y+y)%SCREEN_HEIGHT},&color); - if(y == 0 || y == area.Size.Height -1 || x == 0 || x == area.Size.Width -1) - color = (Color){255,0,0}; + //if(y == 0 || y == area.Size.Height -1 || x == 0 || x == area.Size.Width -1) + //color = (Color){255,0,0}; } SendPixel(color.Red,color.Green,color.Blue); }