From b828775938d3b0077920c487fa0be789dc0a0f01 Mon Sep 17 00:00:00 2001 From: BlubbFish Date: Sat, 16 Nov 2013 17:10:00 +0000 Subject: [PATCH] 20131116-181002 --- Button/Button/Debug/Button.d | 3 + Button/Button/Debug/Button.map | 211 +++++++++++++++++---------------- Button/Button/Led.hpp | 8 +- 3 files changed, 115 insertions(+), 107 deletions(-) diff --git a/Button/Button/Debug/Button.d b/Button/Button/Debug/Button.d index fa78045..9f7ff86 100644 --- a/Button/Button/Debug/Button.d +++ b/Button/Button/Debug/Button.d @@ -11,6 +11,7 @@ Button.d Button.o: .././Button.cpp .././config.h .././canaddress.h \ c:\program\ files\ (x86)\atmel\atmel\ toolchain\avr8\ gcc\native\3.4.2.876\avr8-gnu-toolchain\bin\../lib/gcc/avr/4.7.2/../../../../avr/include/avr/version.h \ c:\program\ files\ (x86)\atmel\atmel\ toolchain\avr8\ gcc\native\3.4.2.876\avr8-gnu-toolchain\bin\../lib/gcc/avr/4.7.2/../../../../avr/include/avr/fuse.h \ c:\program\ files\ (x86)\atmel\atmel\ toolchain\avr8\ gcc\native\3.4.2.876\avr8-gnu-toolchain\bin\../lib/gcc/avr/4.7.2/../../../../avr/include/avr/lock.h \ + c:\program\ files\ (x86)\atmel\atmel\ toolchain\avr8\ gcc\native\3.4.2.876\avr8-gnu-toolchain\bin\../lib/gcc/avr/4.7.2/../../../../avr/include/avr/interrupt.h \ .././uart.hpp \ c:\program\ files\ (x86)\atmel\atmel\ toolchain\avr8\ gcc\native\3.4.2.876\avr8-gnu-toolchain\bin\../lib/gcc/avr/4.7.2/../../../../avr/include/stdio.h \ c:\program\ files\ (x86)\atmel\atmel\ toolchain\avr8\ gcc\native\3.4.2.876\avr8-gnu-toolchain\bin\../lib/gcc/avr/4.7.2/include/stdarg.h \ @@ -52,6 +53,8 @@ c:\program\ files\ (x86)\atmel\atmel\ toolchain\avr8\ gcc\native\3.4.2.876\avr8- c:\program\ files\ (x86)\atmel\atmel\ toolchain\avr8\ gcc\native\3.4.2.876\avr8-gnu-toolchain\bin\../lib/gcc/avr/4.7.2/../../../../avr/include/avr/lock.h: +c:\program\ files\ (x86)\atmel\atmel\ toolchain\avr8\ gcc\native\3.4.2.876\avr8-gnu-toolchain\bin\../lib/gcc/avr/4.7.2/../../../../avr/include/avr/interrupt.h: + .././uart.hpp: c:\program\ files\ (x86)\atmel\atmel\ toolchain\avr8\ gcc\native\3.4.2.876\avr8-gnu-toolchain\bin\../lib/gcc/avr/4.7.2/../../../../avr/include/stdio.h: diff --git a/Button/Button/Debug/Button.map b/Button/Button/Debug/Button.map index ccda3c7..89be892 100644 --- a/Button/Button/Debug/Button.map +++ b/Button/Button/Debug/Button.map @@ -40,7 +40,11 @@ Discarded input sections .group 0x00000000 0x8 Button.o .group 0x00000000 0x8 Button.o .group 0x00000000 0x8 Button.o + .group 0x00000000 0x8 Button.o + .group 0x00000000 0x8 Button.o .text 0x00000000 0x0 Button.o + .text._ZN3LedIN6avrlib5portcELi2ELi1ELi0EE9timer_intEv + 0x00000000 0x76 Button.o .text 0x00000000 0x0 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_exit.o) .bss 0x00000000 0x0 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_exit.o) .text.libgcc.mul @@ -255,7 +259,7 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 .rela.plt *(.rela.plt) -.text 0x00000000 0xe16 +.text 0x00000000 0xe74 *(.vectors) .vectors 0x00000000 0x54 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5/crtm32a.o 0x00000000 __vector_default @@ -341,85 +345,86 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 0x000000aa 0xa Button.o .text._ZN4UartILm9600EE4sendEPKc.isra.2 0x000000b4 0x18 Button.o - .text._ZN6avrlib3pinINS_5portbELh5EE6outputEb.part.22 + .text._ZN6avrlib3pinINS_5portbELh5EE6outputEb.part.20 0x000000cc 0x4 Button.o - .text._ZN6avrlib3pinINS_5portbELh7EE6outputEb.part.23 + .text._ZN6avrlib3pinINS_5portbELh7EE6outputEb.part.21 0x000000d0 0x4 Button.o - .text._ZN3LedIN6avrlib5portcELi2ELi1ELi0EE5colorEh.isra.12 + .text._ZN3LedIN6avrlib5portcELi2ELi1ELi0EE5colorEh 0x000000d4 0x26 Button.o - .text._ZN3LedIN6avrlib5portcELi2ELi1ELi0EE4fadeEhhh.isra.13 - 0x000000fa 0x6a Button.o + 0x000000d4 _ZN3LedIN6avrlib5portcELi2ELi1ELi0EE5colorEh + .text._ZN3LedIN6avrlib5portcELi2ELi1ELi0EE4fadeEhhh.isra.11.constprop.32 + 0x000000fa 0x66 Button.o .text._ZN3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEE4sendEh - 0x00000164 0xe0 Button.o - 0x00000164 _ZN3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEE4sendEh + 0x00000160 0xe0 Button.o + 0x00000160 _ZN3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEE4sendEh .text._ZN6avrlib3pinINS_5portbELh4EE8make_lowEv - 0x00000244 0x6 Button.o - 0x00000244 _ZN6avrlib3pinINS_5portbELh4EE8make_lowEv + 0x00000240 0x6 Button.o + 0x00000240 _ZN6avrlib3pinINS_5portbELh4EE8make_lowEv .text._ZN6avrlib3pinINS_5portbELh4EE9make_highEv - 0x0000024a 0x6 Button.o - 0x0000024a _ZN6avrlib3pinINS_5portbELh4EE9make_highEv + 0x00000246 0x6 Button.o + 0x00000246 _ZN6avrlib3pinINS_5portbELh4EE9make_highEv .text._ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E22mcp2515_write_registerEhh - 0x00000250 0x4c Button.o - 0x00000250 _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E22mcp2515_write_registerEhh + 0x0000024c 0x4c Button.o + 0x0000024c _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E22mcp2515_write_registerEhh .text._ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E8init_canEv - 0x0000029c 0xc8 Button.o - 0x0000029c _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E8init_canEv - .text._ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E16can_send_messageEP10CANMessage - 0x00000364 0x128 Button.o - 0x00000364 _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E16can_send_messageEP10CANMessage - .text._ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E4sendEjhz - 0x0000048c 0x62 Button.o - 0x0000048c _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E4sendEjhz + 0x00000298 0xc8 Button.o + 0x00000298 _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E8init_canEv .text._ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E18mcp2515_bit_modifyEhhh - 0x000004ee 0x5c Button.o - 0x000004ee _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E18mcp2515_bit_modifyEhhh + 0x00000360 0x5c Button.o + 0x00000360 _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E18mcp2515_bit_modifyEhhh .text._ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E15can_get_messageEP10CANMessage - 0x0000054a 0x12a Button.o - 0x0000054a _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E15can_get_messageEP10CANMessage + 0x000003bc 0x12a Button.o + 0x000003bc _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E15can_get_messageEP10CANMessage + .text._ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E16can_send_messageEP10CANMessage + 0x000004e6 0x128 Button.o + 0x000004e6 _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E16can_send_messageEP10CANMessage + .text._ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E4sendEjhz + 0x0000060e 0x62 Button.o + 0x0000060e _ZN3CanI3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEES4_E4sendEjhz .text._Z4initv - 0x00000674 0xe8 Button.o - 0x00000674 _Z4initv + 0x00000670 0xee Button.o + 0x00000670 _Z4initv .text.startup.main - 0x0000075c 0x68 Button.o - 0x0000075c main + 0x0000075e 0xae Button.o + 0x0000075e main .text._ZN3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEEC2Ev - 0x000007c4 0x40 Button.o - 0x000007c4 _ZN3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEEC1Ev - 0x000007c4 _ZN3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEEC2Ev + 0x0000080c 0x40 Button.o + 0x0000080c _ZN3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEEC1Ev + 0x0000080c _ZN3SpiIN6avrlib5portbELi4ELi6ELi5ELi7ELi0E4UartILm9600EEEC2Ev .text.startup._GLOBAL__sub_I_o - 0x00000804 0x58 Button.o - .text.libgcc 0x0000085c 0xc c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_tablejump.o) - 0x0000085c __tablejump2__ - 0x00000860 __tablejump__ + 0x0000084c 0x6e Button.o + .text.libgcc 0x000008ba 0xc c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_tablejump.o) + 0x000008ba __tablejump2__ + 0x000008be __tablejump__ .text.avr-libc - 0x00000868 0x44 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) - 0x00000868 sprintf + 0x000008c6 0x44 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) + 0x000008c6 sprintf .text.avr-libc - 0x000008ac 0x3b8 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) - 0x000008ac vfprintf + 0x0000090a 0x3b8 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + 0x0000090a vfprintf .text.avr-libc - 0x00000c64 0x16 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(strnlen_P.o) - 0x00000c64 strnlen_P + 0x00000cc2 0x16 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(strnlen_P.o) + 0x00000cc2 strnlen_P .text.avr-libc - 0x00000c7a 0x16 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(strnlen.o) - 0x00000c7a strnlen + 0x00000cd8 0x16 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(strnlen.o) + 0x00000cd8 strnlen .text.avr-libc - 0x00000c90 0x58 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) - 0x00000c90 fputc + 0x00000cee 0x58 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) + 0x00000cee fputc .text.avr-libc - 0x00000ce8 0xbc c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(ultoa_invert.o) - 0x00000ce8 __ultoa_invert + 0x00000d46 0xbc c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(ultoa_invert.o) + 0x00000d46 __ultoa_invert .text.libgcc.prologue - 0x00000da4 0x38 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_prologue.o) - 0x00000da4 __prologue_saves__ + 0x00000e02 0x38 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_prologue.o) + 0x00000e02 __prologue_saves__ .text.libgcc.prologue - 0x00000ddc 0x36 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_epilogue.o) - 0x00000ddc __epilogue_restores__ - 0x00000e12 . = ALIGN (0x2) + 0x00000e3a 0x36 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_epilogue.o) + 0x00000e3a __epilogue_restores__ + 0x00000e70 . = ALIGN (0x2) *(.fini9) - .fini9 0x00000e12 0x0 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_exit.o) - 0x00000e12 _exit - 0x00000e12 exit + .fini9 0x00000e70 0x0 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_exit.o) + 0x00000e70 _exit + 0x00000e70 exit *(.fini9) *(.fini8) *(.fini8) @@ -438,11 +443,11 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 *(.fini1) *(.fini1) *(.fini0) - .fini0 0x00000e12 0x4 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_exit.o) + .fini0 0x00000e70 0x4 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/avr5\libgcc.a(_exit.o) *(.fini0) - 0x00000e16 _etext = . + 0x00000e74 _etext = . -.data 0x00800060 0x8c load address 0x00000e16 +.data 0x00800060 0x8c load address 0x00000e74 0x00800060 PROVIDE (__data_start, .) *(.data) .data 0x00800060 0x0 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5/crtm32a.o @@ -485,8 +490,8 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 *(.bss*) *(COMMON) 0x008000f2 PROVIDE (__bss_end, .) - 0x00000e16 __data_load_start = LOADADDR (.data) - 0x00000ea2 __data_load_end = (__data_load_start + SIZEOF (.data)) + 0x00000e74 __data_load_start = LOADADDR (.data) + 0x00000f00 __data_load_end = (__data_load_start + SIZEOF (.data)) .noinit 0x008000f2 0x0 0x008000f2 PROVIDE (__noinit_start, .) @@ -560,66 +565,66 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 .debug_sfnames *(.debug_sfnames) -.debug_aranges 0x00000000 0x110 +.debug_aranges 0x00000000 0x118 *(.debug_aranges) .debug_aranges - 0x00000000 0xb0 Button.o + 0x00000000 0xb8 Button.o .debug_aranges - 0x000000b0 0x20 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) + 0x000000b8 0x20 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) .debug_aranges - 0x000000d0 0x20 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + 0x000000d8 0x20 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) .debug_aranges - 0x000000f0 0x20 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) + 0x000000f8 0x20 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) .debug_pubnames *(.debug_pubnames) -.debug_info 0x00000000 0x3e52 +.debug_info 0x00000000 0x3ee6 *(.debug_info) - .debug_info 0x00000000 0x3591 Button.o - .debug_info 0x00003591 0x204 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) - .debug_info 0x00003795 0x549 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) - .debug_info 0x00003cde 0x174 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) + .debug_info 0x00000000 0x3625 Button.o + .debug_info 0x00003625 0x204 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) + .debug_info 0x00003829 0x549 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + .debug_info 0x00003d72 0x174 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) *(.gnu.linkonce.wi.*) -.debug_abbrev 0x00000000 0x9b4 +.debug_abbrev 0x00000000 0x9ed *(.debug_abbrev) - .debug_abbrev 0x00000000 0x5c3 Button.o - .debug_abbrev 0x000005c3 0x12a c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) - .debug_abbrev 0x000006ed 0x1d6 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) - .debug_abbrev 0x000008c3 0xf1 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) + .debug_abbrev 0x00000000 0x5fc Button.o + .debug_abbrev 0x000005fc 0x12a c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) + .debug_abbrev 0x00000726 0x1d6 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + .debug_abbrev 0x000008fc 0xf1 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) -.debug_line 0x00000000 0xb5e +.debug_line 0x00000000 0xb8d *(.debug_line) - .debug_line 0x00000000 0x638 Button.o - .debug_line 0x00000638 0x14e c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) - .debug_line 0x00000786 0x2fe c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) - .debug_line 0x00000a84 0xda c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) + .debug_line 0x00000000 0x667 Button.o + .debug_line 0x00000667 0x14e c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) + .debug_line 0x000007b5 0x2fe c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + .debug_line 0x00000ab3 0xda c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) -.debug_frame 0x00000000 0x344 +.debug_frame 0x00000000 0x3a8 *(.debug_frame) - .debug_frame 0x00000000 0x290 Button.o - .debug_frame 0x00000290 0x30 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) - .debug_frame 0x000002c0 0x4c c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) - .debug_frame 0x0000030c 0x38 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) + .debug_frame 0x00000000 0x2f4 Button.o + .debug_frame 0x000002f4 0x30 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) + .debug_frame 0x00000324 0x4c c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + .debug_frame 0x00000370 0x38 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) -.debug_str 0x00000000 0x1822 +.debug_str 0x00000000 0x1898 *(.debug_str) - .debug_str 0x00000000 0x1699 Button.o - 0x170f (size before relaxing) - .debug_str 0x00001699 0x7d c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) + .debug_str 0x00000000 0x170f Button.o + 0x1785 (size before relaxing) + .debug_str 0x0000170f 0x7d c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) 0x127 (size before relaxing) - .debug_str 0x00001716 0xbf c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + .debug_str 0x0000178c 0xbf c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) 0x198 (size before relaxing) - .debug_str 0x000017d5 0x4d c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) + .debug_str 0x0000184b 0x4d c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) 0xf8 (size before relaxing) -.debug_loc 0x00000000 0x1083 +.debug_loc 0x00000000 0x1218 *(.debug_loc) - .debug_loc 0x00000000 0xa52 Button.o - .debug_loc 0x00000a52 0x21 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) - .debug_loc 0x00000a73 0x51d c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) - .debug_loc 0x00000f90 0xf3 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) + .debug_loc 0x00000000 0xbe7 Button.o + .debug_loc 0x00000be7 0x21 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) + .debug_loc 0x00000c08 0x51d c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + .debug_loc 0x00001125 0xf3 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) .debug_macinfo *(.debug_macinfo) @@ -627,12 +632,12 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 .debug_pubtypes *(.debug_pubtypes) -.debug_ranges 0x00000000 0x150 +.debug_ranges 0x00000000 0x168 *(.debug_ranges) - .debug_ranges 0x00000000 0x120 Button.o - .debug_ranges 0x00000120 0x10 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) - .debug_ranges 0x00000130 0x10 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) - .debug_ranges 0x00000140 0x10 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) + .debug_ranges 0x00000000 0x138 Button.o + .debug_ranges 0x00000138 0x10 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(sprintf.o) + .debug_ranges 0x00000148 0x10 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(vfprintf_std.o) + .debug_ranges 0x00000158 0x10 c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8-gnu-toolchain/bin/../lib/gcc/avr/4.7.2/../../../../avr/lib/avr5\libc.a(fputc.o) .debug_macro *(.debug_macro) diff --git a/Button/Button/Led.hpp b/Button/Button/Led.hpp index 311b8b1..b56c362 100644 --- a/Button/Button/Led.hpp +++ b/Button/Button/Led.hpp @@ -17,7 +17,7 @@ class Led { Led() { init(); } - void color(uint8_t mask) { + static void color(uint8_t mask) { (mask & (1<<0)) ? blue::make_high() : blue::make_low(); (mask & (1<<1)) ? green::make_high() : green::make_low(); (mask & (1<<2)) ? red::make_high() : red::make_low(); @@ -50,13 +50,13 @@ class Led { static const uint8_t MAGENTA = 5; static const uint8_t YELLOW = 6; static const uint8_t WHITE = 7; - void setColor(uint8_t cr, uint8_t cg, uint8_t cb) { + static void setColor(uint8_t cr, uint8_t cg, uint8_t cb) { r = cr; g = cg; b = cb; } private: - void init() { + static void init() { r = 0; g = 0; b = 0; @@ -95,7 +95,7 @@ class Led { if(icolor(rgb); + color(rgb); } } };