diff --git a/Debug/MyProject.axf b/Debug/MyProject.axf index af2a055..3df48ad 100755 Binary files a/Debug/MyProject.axf and b/Debug/MyProject.axf differ diff --git a/Debug/MyProject.map b/Debug/MyProject.map index 9bae7db..f6698db 100644 --- a/Debug/MyProject.map +++ b/Debug/MyProject.map @@ -80,6 +80,8 @@ Discarded input sections .text 0x00000000 0x0 ./src/SPI.o .data 0x00000000 0x0 ./src/SPI.o .bss 0x00000000 0x0 ./src/SPI.o + .rodata.Ship_3 + 0x00000000 0xc10 ./src/SPI.o .rodata.SCREEN_WIDTH 0x00000000 0x4 ./src/SPI.o .rodata.SCREEN_HEIGHT @@ -661,7 +663,7 @@ END GROUP 0x20084000 __top_RamAHB32 = 0x20084000 0x20084000 __top_RAM2 = 0x20084000 -.text 0x00000000 0x3abd8 +.text 0x00000000 0x3ad38 FILL mask 0xff 0x00000000 __vectors_start__ = ABSOLUTE (.) *(.isr_vector) @@ -670,10 +672,10 @@ END GROUP 0x000000cc . = ALIGN (0x4) 0x000000cc __section_table_start = . 0x000000cc __data_section_table = . - 0x000000cc 0x4 LONG 0x3abd8 LOADADDR (.data) + 0x000000cc 0x4 LONG 0x3ad38 LOADADDR (.data) 0x000000d0 0x4 LONG 0x10000000 ADDR (.data) 0x000000d4 0x4 LONG 0x1c SIZEOF (.data) - 0x000000d8 0x4 LONG 0x3abd8 LOADADDR (.data_RAM2) + 0x000000d8 0x4 LONG 0x3ad38 LOADADDR (.data_RAM2) 0x000000dc 0x4 LONG 0x2007c000 ADDR (.data_RAM2) 0x000000e0 0x4 LONG 0x0 SIZEOF (.data_RAM2) 0x000000e4 __data_section_table_end = . @@ -805,121 +807,120 @@ END GROUP .text.scroll 0x000009c0 0x38 ./src/SPI.o 0x000009c0 scroll .text.Get_Color_From_Background - 0x000009f8 0x5c ./src/SPI.o + 0x000009f8 0x80 ./src/SPI.o 0x000009f8 Get_Color_From_Background .text.Get_Color_From_Sprite - 0x00000a54 0x60 ./src/SPI.o - 0x00000a54 Get_Color_From_Sprite + 0x00000a78 0x60 ./src/SPI.o + 0x00000a78 Get_Color_From_Sprite .text.auto_screen_roloff - 0x00000ab4 0x66 ./src/SPI.o - 0x00000ab4 auto_screen_roloff + 0x00000ad8 0x66 ./src/SPI.o + 0x00000ad8 auto_screen_roloff .text.Refresh_Area - 0x00000b1a 0xa6 ./src/SPI.o - 0x00000b1a Refresh_Area + 0x00000b3e 0xa6 ./src/SPI.o + 0x00000b3e Refresh_Area .text.Refresh_Player_Area - 0x00000bc0 0x1f4 ./src/SPI.o - 0x00000bc0 Refresh_Player_Area + 0x00000be4 0x32c ./src/SPI.o + 0x00000be4 Refresh_Player_Area .text.Draw_stars - 0x00000db4 0x64 ./src/SPI.o - 0x00000db4 Draw_stars - .text.strLen 0x00000e18 0x3a ./src/SPI.o - 0x00000e18 strLen - *fill* 0x00000e52 0x2 ff + 0x00000f10 0x64 ./src/SPI.o + 0x00000f10 Draw_stars + .text.strLen 0x00000f74 0x3a ./src/SPI.o + 0x00000f74 strLen + *fill* 0x00000fae 0x2 ff .text.DrawChar - 0x00000e54 0x108 ./src/SPI.o - 0x00000e54 DrawChar + 0x00000fb0 0x108 ./src/SPI.o + 0x00000fb0 DrawChar .text.DrawText - 0x00000f5c 0x8c ./src/SPI.o - 0x00000f5c DrawText + 0x000010b8 0x8c ./src/SPI.o + 0x000010b8 DrawText .text.SystemInit - 0x00000fe8 0x144 ./src/init_clk.o - 0x00000fe8 SystemInit - .text.init 0x0000112c 0xc ./src/main.o - 0x0000112c init + 0x00001144 0x144 ./src/init_clk.o + 0x00001144 SystemInit + .text.init 0x00001288 0xc ./src/main.o + 0x00001288 init .text.TIMER0_IRQHandler - 0x00001138 0x24 ./src/main.o - 0x00001138 TIMER0_IRQHandler + 0x00001294 0x24 ./src/main.o + 0x00001294 TIMER0_IRQHandler .text.EINT3_IRQHandler - 0x0000115c 0x18 ./src/main.o - 0x0000115c EINT3_IRQHandler + 0x000012b8 0x18 ./src/main.o + 0x000012b8 EINT3_IRQHandler .text.increment_scroll - 0x00001174 0x44 ./src/main.o - 0x00001174 increment_scroll + 0x000012d0 0x44 ./src/main.o + 0x000012d0 increment_scroll .text.SysTick_Handler - 0x000011b8 0x48 ./src/main.o - 0x000011b8 SysTick_Handler + 0x00001314 0x48 ./src/main.o + 0x00001314 SysTick_Handler .text.number_of_digits - 0x00001200 0x40 ./src/main.o - 0x00001200 number_of_digits + 0x0000135c 0x40 ./src/main.o + 0x0000135c number_of_digits .text.convert_to_string - 0x00001240 0x7c ./src/main.o - 0x00001240 convert_to_string + 0x0000139c 0x7c ./src/main.o + 0x0000139c convert_to_string .text.CreatePlayer - 0x000012bc 0x9c ./src/main.o - 0x000012bc CreatePlayer - .text.min 0x00001358 0x22 ./src/main.o - 0x00001358 min - *fill* 0x0000137a 0x2 ff + 0x00001418 0x9c ./src/main.o + 0x00001418 CreatePlayer + .text.min 0x000014b4 0x22 ./src/main.o + 0x000014b4 min + *fill* 0x000014d6 0x2 ff .text.RefreshPlayer - 0x0000137c 0x144 ./src/main.o - 0x0000137c RefreshPlayer - .text.main 0x000014c0 0x214 ./src/main.o - 0x000014c0 main - .text.memcpy 0x000016d4 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) - 0x000016d4 memcpy + 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 .text.__weak_main - 0x000016d8 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) - 0x000016d8 __main - 0x000016d8 __weak_main - .text.abs 0x000016dc 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) - 0x000016dc abs + 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 .text.__aeabi_memcpy - 0x000016e4 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) - 0x000016e4 __aeabi_memcpy - 0x000016ee __aeabi_memcpy4 - 0x000016ee __aeabi_memcpy8 + 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 *(.rodata .rodata.* .constdata .constdata.*) - .rodata.SMPTE 0x00001718 0x38410 ./src/SPI.o + .rodata.SMPTE 0x00001878 0x38410 ./src/SPI.o .rodata.ShipSprite1 - 0x00039b28 0xc10 ./src/SPI.o - 0x00039b28 ShipSprite1 + 0x00039c88 0xc10 ./src/SPI.o .rodata.SmallFont - 0x0003a738 0x478 ./src/fonts.o - 0x0003a738 SmallFont + 0x0003a898 0x478 ./src/fonts.o + 0x0003a898 SmallFont .rodata.SCREEN - 0x0003abb0 0x10 ./src/main.o - 0x0003abb0 SCREEN - .rodata 0x0003abc0 0x18 ./src/main.o - 0x0003abd8 . = ALIGN (0x4) + 0x0003ad10 0x10 ./src/main.o + 0x0003ad10 SCREEN + .rodata 0x0003ad20 0x18 ./src/main.o + 0x0003ad38 . = ALIGN (0x4) -.glue_7 0x0003abd8 0x0 - .glue_7 0x0003abd8 0x0 linker stubs +.glue_7 0x0003ad38 0x0 + .glue_7 0x0003ad38 0x0 linker stubs -.glue_7t 0x0003abd8 0x0 - .glue_7t 0x0003abd8 0x0 linker stubs +.glue_7t 0x0003ad38 0x0 + .glue_7t 0x0003ad38 0x0 linker stubs -.vfp11_veneer 0x0003abd8 0x0 - .vfp11_veneer 0x0003abd8 0x0 linker stubs +.vfp11_veneer 0x0003ad38 0x0 + .vfp11_veneer 0x0003ad38 0x0 linker stubs -.v4_bx 0x0003abd8 0x0 - .v4_bx 0x0003abd8 0x0 linker stubs +.v4_bx 0x0003ad38 0x0 + .v4_bx 0x0003ad38 0x0 linker stubs -.iplt 0x0003abd8 0x0 - .iplt 0x0003abd8 0x0 ./src/SPI.o +.iplt 0x0003ad38 0x0 + .iplt 0x0003ad38 0x0 ./src/SPI.o -.rel.dyn 0x0003abd8 0x0 - .rel.iplt 0x0003abd8 0x0 ./src/SPI.o +.rel.dyn 0x0003ad38 0x0 + .rel.iplt 0x0003ad38 0x0 ./src/SPI.o .ARM.extab *(.ARM.extab* .gnu.linkonce.armextab.*) -.ARM.exidx 0x0003abd8 0x0 - 0x0003abd8 __exidx_start = . +.ARM.exidx 0x0003ad38 0x0 + 0x0003ad38 __exidx_start = . *(.ARM.exidx* .gnu.linkonce.armexidx.*) - 0x0003abd8 __exidx_end = . - 0x0003abd8 _etext = . + 0x0003ad38 __exidx_end = . + 0x0003ad38 _etext = . -.data_RAM2 0x2007c000 0x0 load address 0x0003abd8 +.data_RAM2 0x2007c000 0x0 load address 0x0003ad38 FILL mask 0xff [!provide] PROVIDE (__start_data_RAM2 = .) [!provide] PROVIDE (__start_data_RamAHB32 = .) @@ -940,7 +941,7 @@ END GROUP 0x10000000 . = ALIGN (0x4) 0x10000000 _end_uninit_RESERVED = . -.data 0x10000000 0x1c load address 0x0003abd8 +.data 0x10000000 0x1c load address 0x0003ad38 FILL mask 0xff 0x10000000 _data = . [!provide] PROVIDE (__start_data_RAM = .) @@ -968,7 +969,7 @@ END GROUP [!provide] PROVIDE (__end_data_RAM = .) [!provide] PROVIDE (__end_data_RamLoc32 = .) -.igot.plt 0x1000001c 0x0 load address 0x0003abf4 +.igot.plt 0x1000001c 0x0 load address 0x0003ad54 .igot.plt 0x1000001c 0x0 ./src/SPI.o .bss_RAM2 0x2007c000 0x0 @@ -1030,34 +1031,34 @@ 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) - 0x0003abf4 _image_end = (LOADADDR (.data) + SIZEOF (.data)) - 0x0003abf4 _image_size = (_image_end - _image_start) + 0x0003ad54 _image_end = (LOADADDR (.data) + SIZEOF (.data)) + 0x0003ad54 _image_size = (_image_end - _image_start) OUTPUT(MyProject.axf elf32-littlearm) LOAD linker stubs -.debug_info 0x00000000 0x1e8e +.debug_info 0x00000000 0x1ee7 .debug_info 0x00000000 0x208 ./src/GPIO.o - .debug_info 0x00000208 0xae3 ./src/SPI.o - .debug_info 0x00000ceb 0x29d ./src/cr_startup_lpc175x_6x.o - .debug_info 0x00000f88 0x40 ./src/crp.o - .debug_info 0x00000fc8 0xc9 ./src/fonts.o - .debug_info 0x00001091 0xb5 ./src/init_clk.o - .debug_info 0x00001146 0x72a ./src/main.o - .debug_info 0x00001870 0x119 /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_info 0x00001989 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_info 0x000019d3 0x4bb /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_info 0x00000208 0xb3c ./src/SPI.o + .debug_info 0x00000d44 0x29d ./src/cr_startup_lpc175x_6x.o + .debug_info 0x00000fe1 0x40 ./src/crp.o + .debug_info 0x00001021 0xc9 ./src/fonts.o + .debug_info 0x000010ea 0xb5 ./src/init_clk.o + .debug_info 0x0000119f 0x72a ./src/main.o + .debug_info 0x000018c9 0x119 /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_info 0x000019e2 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_info 0x00001a2c 0x4bb /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_abbrev 0x00000000 0xca1 +.debug_abbrev 0x00000000 0xc94 .debug_abbrev 0x00000000 0x12b ./src/GPIO.o - .debug_abbrev 0x0000012b 0x2c2 ./src/SPI.o - .debug_abbrev 0x000003ed 0x14d ./src/cr_startup_lpc175x_6x.o - .debug_abbrev 0x0000053a 0x38 ./src/crp.o - .debug_abbrev 0x00000572 0x73 ./src/fonts.o - .debug_abbrev 0x000005e5 0x83 ./src/init_clk.o - .debug_abbrev 0x00000668 0x27d ./src/main.o - .debug_abbrev 0x000008e5 0xb6 /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_abbrev 0x0000099b 0x4f /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_abbrev 0x000009ea 0x2b7 /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_abbrev 0x0000012b 0x2b5 ./src/SPI.o + .debug_abbrev 0x000003e0 0x14d ./src/cr_startup_lpc175x_6x.o + .debug_abbrev 0x0000052d 0x38 ./src/crp.o + .debug_abbrev 0x00000565 0x73 ./src/fonts.o + .debug_abbrev 0x000005d8 0x83 ./src/init_clk.o + .debug_abbrev 0x0000065b 0x27d ./src/main.o + .debug_abbrev 0x000008d8 0xb6 /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_abbrev 0x0000098e 0x4f /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_abbrev 0x000009dd 0x2b7 /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_aranges 0x00000000 0x368 .debug_aranges @@ -1091,7 +1092,7 @@ LOAD linker stubs .debug_ranges 0x00000230 0x10 /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_ranges 0x00000240 0x78 /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_macro 0x00000000 0x1718 +.debug_macro 0x00000000 0x1722 .debug_macro 0x00000000 0x58 ./src/GPIO.o .debug_macro 0x00000058 0xab4 ./src/GPIO.o .debug_macro 0x00000b0c 0x10 ./src/GPIO.o @@ -1099,48 +1100,48 @@ LOAD linker stubs .debug_macro 0x00000c4a 0x5b3 ./src/GPIO.o .debug_macro 0x000011fd 0x22 ./src/GPIO.o .debug_macro 0x0000121f 0x196 ./src/GPIO.o - .debug_macro 0x000013b5 0x8d ./src/SPI.o - .debug_macro 0x00001442 0x10 ./src/SPI.o - .debug_macro 0x00001452 0x1d ./src/cr_startup_lpc175x_6x.o - .debug_macro 0x0000146f 0x1a ./src/crp.o - .debug_macro 0x00001489 0x34 ./src/crp.o - .debug_macro 0x000014bd 0x1a ./src/fonts.o - .debug_macro 0x000014d7 0x112 ./src/init_clk.o - .debug_macro 0x000015e9 0x6b ./src/main.o - .debug_macro 0x00001654 0xc4 ./src/main.o + .debug_macro 0x000013b5 0x97 ./src/SPI.o + .debug_macro 0x0000144c 0x10 ./src/SPI.o + .debug_macro 0x0000145c 0x1d ./src/cr_startup_lpc175x_6x.o + .debug_macro 0x00001479 0x1a ./src/crp.o + .debug_macro 0x00001493 0x34 ./src/crp.o + .debug_macro 0x000014c7 0x1a ./src/fonts.o + .debug_macro 0x000014e1 0x112 ./src/init_clk.o + .debug_macro 0x000015f3 0x6b ./src/main.o + .debug_macro 0x0000165e 0xc4 ./src/main.o -.debug_line 0x00000000 0x1d26 +.debug_line 0x00000000 0x1de2 .debug_line 0x00000000 0x358 ./src/GPIO.o - .debug_line 0x00000358 0x9ad ./src/SPI.o - .debug_line 0x00000d05 0x161 ./src/cr_startup_lpc175x_6x.o - .debug_line 0x00000e66 0xb9 ./src/crp.o - .debug_line 0x00000f1f 0x3a ./src/fonts.o - .debug_line 0x00000f59 0x3c8 ./src/init_clk.o - .debug_line 0x00001321 0x5e1 ./src/main.o - .debug_line 0x00001902 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 0x0000199d 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 0x000019e7 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 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_str 0x00000000 0x63ea +.debug_str 0x00000000 0x6400 .debug_str 0x00000000 0x5145 ./src/GPIO.o 0x51c4 (size before relaxing) - .debug_str 0x00005145 0x3e7 ./src/SPI.o - 0x5531 (size before relaxing) - .debug_str 0x0000552c 0x1ef ./src/cr_startup_lpc175x_6x.o + .debug_str 0x00005145 0x3fd ./src/SPI.o + 0x5547 (size before relaxing) + .debug_str 0x00005542 0x1ef ./src/cr_startup_lpc175x_6x.o 0x2ff0 (size before relaxing) - .debug_str 0x0000571b 0xe9 ./src/crp.o + .debug_str 0x00005731 0xe9 ./src/crp.o 0x2ee4 (size before relaxing) - .debug_str 0x00005804 0x27 ./src/fonts.o + .debug_str 0x0000581a 0x27 ./src/fonts.o 0x2e69 (size before relaxing) - .debug_str 0x0000582b 0x2e1 ./src/init_clk.o + .debug_str 0x00005841 0x2e1 ./src/init_clk.o 0x53e9 (size before relaxing) - .debug_str 0x00005b0c 0x6a0 ./src/main.o + .debug_str 0x00005b22 0x6a0 ./src/main.o 0x5935 (size before relaxing) - .debug_str 0x000061ac 0x132 /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_str 0x000061c2 0x132 /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) 0x1bb (size before relaxing) - .debug_str 0x000062de 0x22 /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_str 0x000062f4 0x22 /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) 0x12a (size before relaxing) - .debug_str 0x00006300 0xea /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 0x00006316 0xea /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) 0x27b (size before relaxing) .comment 0x00000000 0x45 @@ -1289,7 +1290,6 @@ SendPixel ./src/SPI.o SetAudio ./src/GPIO.o ./src/main.o SevenSegNumFont ./src/fonts.o -ShipSprite1 ./src/SPI.o SmallFont ./src/fonts.o ./src/SPI.o Split_Uint8 ./src/SPI.o diff --git a/Debug/MyProject_Debug.ld b/Debug/MyProject_Debug.ld index eb7b212..b2d3651 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, 8:40:30 PM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 13, 2024, 9:19:10 PM */ INCLUDE "MyProject_Debug_library.ld" diff --git a/Debug/MyProject_Debug_library.ld b/Debug/MyProject_Debug_library.ld index 1147360..77c8069 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, 8:40:30 PM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 13, 2024, 9:19:10 PM */ GROUP ( diff --git a/Debug/MyProject_Debug_memory.ld b/Debug/MyProject_Debug_memory.ld index d8cdf9b..a5ab194 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, 8:40:30 PM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 13, 2024, 9:19:10 PM */ MEMORY diff --git a/Debug/src/SPI.d b/Debug/src/SPI.d index 28660ce..fb30672 100644 --- a/Debug/src/SPI.d +++ b/Debug/src/SPI.d @@ -1,6 +1,6 @@ src/SPI.o src/SPI.d: ../src/SPI.c ../src/config_LPC1769.h ../src/GPIO.h \ ../src/SPI.h ../src/init_clk.h ../src/fonts.h ../src/Background_image.h \ - ../src/testChart.h ../src/Ship_1.h + ../src/testChart.h ../src/Ship_1.h ../src/Ship_3.h ../src/config_LPC1769.h: ../src/GPIO.h: ../src/SPI.h: @@ -9,3 +9,4 @@ src/SPI.o src/SPI.d: ../src/SPI.c ../src/config_LPC1769.h ../src/GPIO.h \ ../src/Background_image.h: ../src/testChart.h: ../src/Ship_1.h: +../src/Ship_3.h: diff --git a/Debug/src/SPI.o b/Debug/src/SPI.o index 43ae087..73a5f91 100644 Binary files a/Debug/src/SPI.o and b/Debug/src/SPI.o differ diff --git a/Debug/src/SPI.su b/Debug/src/SPI.su index 8c94ada..42e949c 100644 --- a/Debug/src/SPI.su +++ b/Debug/src/SPI.su @@ -1,24 +1,24 @@ -../src/SPI.c:25:6:Init_SPI 8 static -../src/SPI.c:42:6:DC_MODE_DATA 4 static -../src/SPI.c:45:6:DC_MODE_COMMAND 4 static -../src/SPI.c:48:6:CS_UP 4 static -../src/SPI.c:51:6:CS_DOWN 4 static -../src/SPI.c:54:6:Write_Cmd 16 static -../src/SPI.c:64:6:Write_Cmd_Data 16 static -../src/SPI.c:74:6:ILI9341_Initial 8 static -../src/SPI.c:193:9:Split_Uint8 24 static -../src/SPI.c:198:6:SendPixel 24 static -../src/SPI.c:211:6:Resize_Window 64 static -../src/SPI.c:245:6:scroll 24 static -../src/SPI.c:255:6:Get_Color_From_Background 32 static -../src/SPI.c:262:6:Get_Color_From_Sprite 16 static -../src/SPI.c:268:6:auto_screen_roloff 64 static -../src/SPI.c:278:6:Refresh_Area 72 static -../src/SPI.c:290:6:Refresh_Player_Area 6240 static -../src/SPI.c:313:6:DrawPlayer 6232 static -../src/SPI.c:334:6:Draw_stars 32 static -../src/SPI.c:344:5:strLen 24 static -../src/SPI.c:354:6:DrawChar 72 static -../src/SPI.c:375:6:DrawText 72 static -../src/SPI.c:383:6:DrawSolidBackground 24 static -../src/SPI.c:391:6:Fill_Gradient 48 static +../src/SPI.c:26:6:Init_SPI 8 static +../src/SPI.c:43:6:DC_MODE_DATA 4 static +../src/SPI.c:46:6:DC_MODE_COMMAND 4 static +../src/SPI.c:49:6:CS_UP 4 static +../src/SPI.c:52:6:CS_DOWN 4 static +../src/SPI.c:55:6:Write_Cmd 16 static +../src/SPI.c:65:6:Write_Cmd_Data 16 static +../src/SPI.c:75:6:ILI9341_Initial 8 static +../src/SPI.c:194:9:Split_Uint8 24 static +../src/SPI.c:199:6:SendPixel 24 static +../src/SPI.c:212:6:Resize_Window 64 static +../src/SPI.c:246:6:scroll 24 static +../src/SPI.c:256:6:Get_Color_From_Background 32 static +../src/SPI.c:269:6:Get_Color_From_Sprite 16 static +../src/SPI.c:275:6:auto_screen_roloff 64 static +../src/SPI.c:285:6:Refresh_Area 72 static +../src/SPI.c:297:6:Refresh_Player_Area 6256 static +../src/SPI.c:323:6:DrawPlayer 6232 static +../src/SPI.c:344:6:Draw_stars 32 static +../src/SPI.c:354:5:strLen 24 static +../src/SPI.c:364:6:DrawChar 72 static +../src/SPI.c:385:6:DrawText 72 static +../src/SPI.c:393:6:DrawSolidBackground 24 static +../src/SPI.c:401:6:Fill_Gradient 48 static diff --git a/Debug/src/main.o b/Debug/src/main.o index 9afd3c3..ab5edc4 100644 Binary files a/Debug/src/main.o and b/Debug/src/main.o differ diff --git a/Debug/src/main.su b/Debug/src/main.su index 694e9e3..555293b 100644 --- a/Debug/src/main.su +++ b/Debug/src/main.su @@ -9,4 +9,4 @@ ../src/main.c:103:8:CreatePlayer 80 static ../src/main.c:112:5:min 16 static ../src/main.c:120:6:RefreshPlayer 72 static -../src/main.c:155:5:main 144 dynamic +../src/main.c:163:5:main 144 dynamic diff --git a/src/SPI.c b/src/SPI.c index 29251e3..b65c1c0 100644 --- a/src/SPI.c +++ b/src/SPI.c @@ -14,6 +14,7 @@ #include "Background_image.h" #include "testChart.h" #include "Ship_1.h" +#include "Ship_3.h" const int SCREEN_WIDTH = 240; const int SCREEN_HEIGHT = 320; @@ -253,7 +254,13 @@ void scroll(uint16_t scroll){ } void Get_Color_From_Background(Point whereToLook,Color *color){ + if(whereToLook.Y < 0) + whereToLook.Y = whereToLook.Y % SCREEN_HEIGHT; int index = (whereToLook.Y*SCREEN_WIDTH+whereToLook.X)*3; + + if(index < 0) + index = 1; + color->Red = SMPTE.pixel_data[index]; color->Green = SMPTE.pixel_data[index+1]; color->Blue = SMPTE.pixel_data[index+2]; @@ -301,12 +308,15 @@ void Refresh_Player_Area(Rectangle area,Rectangle Hitbox){ && x + area.Position.X < Hitbox.Position.X + Hitbox.Size.Width){ Get_Color_From_Sprite(sprite,(Point){x-(Hitbox.Position.X - area.Position.X),y-(Hitbox.Position.Y-area.Position.Y)},&color); - SendPixel(color.Red,color.Green,color.Blue); + + if(color.Red == 0 && color.Green == 0 && color.Blue == 0) + 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); - //SendPixel(color.Red,color.Green,color.Blue); - SendPixel(0,0,0); + 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}; } + SendPixel(color.Red,color.Green,color.Blue); } } } diff --git a/src/Ship_1.h b/src/Ship_1.h index 8173ca3..852d7e8 100644 --- a/src/Ship_1.h +++ b/src/Ship_1.h @@ -3,14 +3,14 @@ /* GIMP RGB C-Source image dump (Ship_1.c) */ -typedef struct Sprite_32x32_t{ +const typedef struct Sprite_32x32_t{ unsigned int width; unsigned int height; unsigned int bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */ unsigned char pixel_data[32 * 32 * 3 + 1]; }Sprite_32x32; -const Sprite_32x32 ShipSprite1 = { +static const Sprite_32x32 ShipSprite1 = { 32, 32, 3, "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" diff --git a/src/Ship_3.h b/src/Ship_3.h new file mode 100644 index 0000000..cefd6d7 --- /dev/null +++ b/src/Ship_3.h @@ -0,0 +1,108 @@ +#ifndef SPRITE_SHIP_3 +#define SPRITE_SHIP_3 +/* GIMP RGB C-Source image dump (Ship_3.c) */ + +static const struct { + unsigned int width; + unsigned int height; + unsigned int bytes_per_pixel; /* 2:RGB16, 3:RGB, 4:RGBA */ + unsigned char pixel_data[32 * 32 * 3 + 1]; +} Ship_3 = { + 32, 32, 3, + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\364\364\364\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\364\364\364\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\364\364\364\364\364\364\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\364\364\364\364\364\364\000\000\000\000\000\000" + "\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000" + "\000\000\000\364\364\364\063= SCREEN_SIZE.Height){ player.Hitbox.Position.Y = vector.Y - (SCREEN_SIZE.Height - player.Hitbox.Position.Y); @@ -147,9 +153,11 @@ void RefreshPlayer(Point vector){ Refresh_Player_Area((Rectangle){bigPos,bigSize},player.Hitbox); - //Rectangle rect = player.Hitbox; - //rect.Position = (Point){0,0}; - //DrawPlayer(player,rect); + /* + Rectangle rect = player.Hitbox; + rect.Position = (Point){0,0}; + DrawPlayer(player,rect); + */ } int main(void) {