diff --git a/Debug/MyProject.axf b/Debug/MyProject.axf index a47378b..d4d0eab 100755 Binary files a/Debug/MyProject.axf and b/Debug/MyProject.axf differ diff --git a/Debug/MyProject.map b/Debug/MyProject.map index 069e2b8..57b8ae3 100644 --- a/Debug/MyProject.map +++ b/Debug/MyProject.map @@ -675,7 +675,7 @@ END GROUP 0x20084000 __top_RamAHB32 = 0x20084000 0x20084000 __top_RAM2 = 0x20084000 -.text 0x00000000 0x52620 +.text 0x00000000 0x5262c FILL mask 0xff 0x00000000 __vectors_start__ = ABSOLUTE (.) *(.isr_vector) @@ -684,10 +684,10 @@ END GROUP 0x000000cc . = ALIGN (0x4) 0x000000cc __section_table_start = . 0x000000cc __data_section_table = . - 0x000000cc 0x4 LONG 0x52620 LOADADDR (.data) + 0x000000cc 0x4 LONG 0x5262c LOADADDR (.data) 0x000000d0 0x4 LONG 0x10000000 ADDR (.data) 0x000000d4 0x4 LONG 0x110 SIZEOF (.data) - 0x000000d8 0x4 LONG 0x52620 LOADADDR (.data_RAM2) + 0x000000d8 0x4 LONG 0x5262c LOADADDR (.data_RAM2) 0x000000dc 0x4 LONG 0x2007c000 ADDR (.data_RAM2) 0x000000e0 0x4 LONG 0x0 SIZEOF (.data_RAM2) 0x000000e4 __data_section_table_end = . @@ -890,62 +890,62 @@ END GROUP .text.InitGame 0x00001718 0x64 ./src/main.o 0x00001718 InitGame - .text.main 0x0000177c 0x258 ./src/main.o + .text.main 0x0000177c 0x264 ./src/main.o 0x0000177c main .text.__weak_main - 0x000019d4 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) - 0x000019d4 __main - 0x000019d4 __weak_main - .text.rand 0x000019d8 0x48 /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) - 0x000019d8 rand - .text.srand 0x00001a20 0x40 /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) - 0x00001a20 srand - .text.abs 0x00001a60 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) - 0x00001a60 abs + 0x000019e0 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) + 0x000019e0 __main + 0x000019e0 __weak_main + .text.rand 0x000019e4 0x48 /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) + 0x000019e4 rand + .text.srand 0x00001a2c 0x40 /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) + 0x00001a2c srand + .text.abs 0x00001a6c 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) + 0x00001a6c abs *(.rodata .rodata.* .constdata .constdata.*) - .rodata.SMPTE 0x00001a68 0x38410 ./src/SPI.o + .rodata.SMPTE 0x00001a74 0x38410 ./src/SPI.o .rodata.ShipSprite1 - 0x00039e78 0xc10 ./src/SPI.o + 0x00039e84 0xc10 ./src/SPI.o .rodata.SmallFont - 0x0003aa88 0x478 ./src/fonts.o - 0x0003aa88 SmallFont + 0x0003aa94 0x478 ./src/fonts.o + 0x0003aa94 SmallFont .rodata.AllMyFellas_wav - 0x0003af00 0x17700 ./src/main.o - 0x0003af00 AllMyFellas_wav + 0x0003af0c 0x17700 ./src/main.o + 0x0003af0c AllMyFellas_wav .rodata.SCREEN - 0x00052600 0x10 ./src/main.o - 0x00052600 SCREEN - .rodata 0x00052610 0x10 ./src/main.o - 0x00052620 . = ALIGN (0x4) + 0x0005260c 0x10 ./src/main.o + 0x0005260c SCREEN + .rodata 0x0005261c 0x10 ./src/main.o + 0x0005262c . = ALIGN (0x4) -.glue_7 0x00052620 0x0 - .glue_7 0x00052620 0x0 linker stubs +.glue_7 0x0005262c 0x0 + .glue_7 0x0005262c 0x0 linker stubs -.glue_7t 0x00052620 0x0 - .glue_7t 0x00052620 0x0 linker stubs +.glue_7t 0x0005262c 0x0 + .glue_7t 0x0005262c 0x0 linker stubs -.vfp11_veneer 0x00052620 0x0 - .vfp11_veneer 0x00052620 0x0 linker stubs +.vfp11_veneer 0x0005262c 0x0 + .vfp11_veneer 0x0005262c 0x0 linker stubs -.v4_bx 0x00052620 0x0 - .v4_bx 0x00052620 0x0 linker stubs +.v4_bx 0x0005262c 0x0 + .v4_bx 0x0005262c 0x0 linker stubs -.iplt 0x00052620 0x0 - .iplt 0x00052620 0x0 ./src/SPI.o +.iplt 0x0005262c 0x0 + .iplt 0x0005262c 0x0 ./src/SPI.o -.rel.dyn 0x00052620 0x0 - .rel.iplt 0x00052620 0x0 ./src/SPI.o +.rel.dyn 0x0005262c 0x0 + .rel.iplt 0x0005262c 0x0 ./src/SPI.o .ARM.extab *(.ARM.extab* .gnu.linkonce.armextab.*) -.ARM.exidx 0x00052620 0x0 - 0x00052620 __exidx_start = . +.ARM.exidx 0x0005262c 0x0 + 0x0005262c __exidx_start = . *(.ARM.exidx* .gnu.linkonce.armexidx.*) - 0x00052620 __exidx_end = . - 0x00052620 _etext = . + 0x0005262c __exidx_end = . + 0x0005262c _etext = . -.data_RAM2 0x2007c000 0x0 load address 0x00052620 +.data_RAM2 0x2007c000 0x0 load address 0x0005262c FILL mask 0xff [!provide] PROVIDE (__start_data_RAM2 = .) [!provide] PROVIDE (__start_data_RamAHB32 = .) @@ -966,7 +966,7 @@ END GROUP 0x10000000 . = ALIGN (0x4) 0x10000000 _end_uninit_RESERVED = . -.data 0x10000000 0x110 load address 0x00052620 +.data 0x10000000 0x110 load address 0x0005262c FILL mask 0xff 0x10000000 _data = . [!provide] PROVIDE (__start_data_RAM = .) @@ -1008,7 +1008,7 @@ END GROUP [!provide] PROVIDE (__end_data_RAM = .) [!provide] PROVIDE (__end_data_RamLoc32 = .) -.igot.plt 0x10000110 0x0 load address 0x00052730 +.igot.plt 0x10000110 0x0 load address 0x0005273c .igot.plt 0x10000110 0x0 ./src/SPI.o .bss_RAM2 0x2007c000 0x0 @@ -1082,8 +1082,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) - 0x00052730 _image_end = (LOADADDR (.data) + SIZEOF (.data)) - 0x00052730 _image_size = (_image_end - _image_start) + 0x0005273c _image_end = (LOADADDR (.data) + SIZEOF (.data)) + 0x0005273c _image_size = (_image_end - _image_start) OUTPUT(MyProject.axf elf32-littlearm) LOAD linker stubs @@ -1157,16 +1157,16 @@ LOAD linker stubs .debug_macro 0x0000167b 0xc4 ./src/main.o .debug_macro 0x0000173f 0x28 ./src/main.o -.debug_line 0x00000000 0x1fe2 +.debug_line 0x00000000 0x1ff0 .debug_line 0x00000000 0x358 ./src/GPIO.o .debug_line 0x00000358 0xade ./src/SPI.o .debug_line 0x00000e36 0x161 ./src/cr_startup_lpc175x_6x.o .debug_line 0x00000f97 0xb9 ./src/crp.o .debug_line 0x00001050 0x3a ./src/fonts.o .debug_line 0x0000108a 0x3c8 ./src/init_clk.o - .debug_line 0x00001452 0x807 ./src/main.o - .debug_line 0x00001c59 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 0x00001ca3 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 0x00001452 0x815 ./src/main.o + .debug_line 0x00001c67 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 0x00001cb1 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 0x651d .debug_str 0x00000000 0x5145 ./src/GPIO.o diff --git a/Debug/MyProject_Debug.ld b/Debug/MyProject_Debug.ld index b5a0b44..f19049b 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 15, 2024, 11:32:54 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 15, 2024, 11:50:43 AM */ INCLUDE "MyProject_Debug_library.ld" diff --git a/Debug/MyProject_Debug_library.ld b/Debug/MyProject_Debug_library.ld index e31b0bf..81e338d 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 15, 2024, 11:32:54 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 15, 2024, 11:50:43 AM */ GROUP ( diff --git a/Debug/MyProject_Debug_memory.ld b/Debug/MyProject_Debug_memory.ld index 96b5367..fd8fe62 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 15, 2024, 11:32:54 AM + * MCUXpresso IDE v11.9.0 [Build 2144] [2024-01-05] on Jun 15, 2024, 11:50:43 AM */ MEMORY diff --git a/Debug/src/main.o b/Debug/src/main.o index 118f353..25295b1 100644 Binary files a/Debug/src/main.o and b/Debug/src/main.o differ diff --git a/src/main.c b/src/main.c index ac59297..7581dac 100644 --- a/src/main.c +++ b/src/main.c @@ -251,7 +251,7 @@ int main(void) { Point text_origin = {SCREEN_SIZE.Width / 2 - (digits*charSize.Width)/2,SCREEN_SIZE.Height / 10 * 9 - (charSize.Height/2)}; Point new_origin = {text_origin.X,(text_origin.Y + scrolling)%320}; - Rectangle areaToRefresh = {{new_origin.X,new_origin.Y+3},{charSize.Width* 4,charSize.Height+5}}; + Rectangle areaToRefresh = {{new_origin.X,new_origin.Y+3},{charSize.Width*digits,charSize.Height+charSize.Height/2}}; Refresh_Area(areaToRefresh); DrawText(new_origin,newStr,charSize);