diff --git a/Leuchtklotz/Leuchtklotz.atsuo b/Leuchtklotz/Leuchtklotz.atsuo index 14e05d7..6795dc9 100644 Binary files a/Leuchtklotz/Leuchtklotz.atsuo and b/Leuchtklotz/Leuchtklotz.atsuo differ diff --git a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.elf b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.elf index 67d96f0..5743b27 100644 Binary files a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.elf and b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.elf differ diff --git a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.hex b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.hex index 259762c..2086171 100644 --- a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.hex +++ b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.hex @@ -2,7 +2,7 @@ :100010001AC019C018C017C016C015C014C013C02C :1000200012C011C010C00FC00EC011241FBECFEDF2 :10003000CDBF20E0A0E6B0E001C01D92A036B2071F -:10004000E1F74BD152C1DCCF6770772780FF06C044 +:10004000E1F7ACD1B2C1DCCF6770772780FF06C083 :1000500098B3987F98BB98B3962B98BB81FF0DC03F :1000600098B3977C98BB98B39B01220F331F220F44 :10007000331F220F331F292B28BB82FF06C092B3E8 @@ -36,13 +36,25 @@ :10023000000025E030E047E050E066E070E08FE04D :1002400090E032DF60E070E08FE090E0FDDE089546 :1002500088B3806C88BB969A8FE493EC0197F1F792 -:1002600000C000000895CF93C82F282F30E043E04E -:1002700050E061E070E08FE090E016DF2C2F30E07E -:1002800042E050E063E070E08FE090E00DDF2C2F63 -:1002900030E046E050E062E070E08FE090E004DFA4 -:1002A0002C2F30E044E050E066E070E08FE090E01A -:1002B000FBDE2C2F30E045E050E064E070E08FE0A2 -:1002C00090E0F2DE2C2F30E041E050E065E070E09D -:1002D0008FE090E0E9DECF9108958FE387BB81BB8B -:0E02E000B7DF40DF84E6BFDFFDCFF894FFCF2D +:1002600000C000000895CF93C5E063E070E08AE02D +:1002700090E0EADE2FEF80E792E02150804090404E +:10028000E1F700C0000060E070E08AE090E0DCDEB2 +:100290002FEF80E792E0215080409040E1F700C0CE +:1002A0000000C15011F72FEF80E792E0215080400D +:1002B0009040E1F700C000002FEF80E792E021506E +:1002C00080409040E1F700C000002FEF80E792E00F +:1002D000215080409040E1F700C000002FEF80E700 +:1002E00092E0215080409040E1F700C000002FEFE5 +:1002F00080E792E0215080409040E1F700C000008C +:10030000C5E02FEF80E792E0215080409040E1F778 +:1003100000C0000061E070E084E090E095DE2FEF27 +:1003200080E792E0215080409040E1F700C000005B +:1003300060E070E084E090E087DEC15011F72FEFBD +:1003400080E792E0215080409040E1F700C000003B +:100350002FEF80E792E0215080409040E1F700C00D +:1003600000002FEF80E792E0215080409040E1F7BD +:1003700000C000002FEF80E792E0215080409040C5 +:10038000E1F700C000002FEF80E792E021508040AD +:100390009040E1F700C00000CF9108958FE387BB44 +:0E03A00081BB56DFDFDE5FDFFECFF894FFCFBC :00000001FF diff --git a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.lss b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.lss index ae6e2d1..1379398 100644 --- a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.lss +++ b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.lss @@ -3,31 +3,31 @@ Leuchtklotz.elf: file format elf32-avr Sections: Idx Name Size VMA LMA File off Algn - 0 .text 000002ee 00000000 00000000 00000074 2**1 + 0 .text 000003ae 00000000 00000000 00000074 2**1 CONTENTS, ALLOC, LOAD, READONLY, CODE - 1 .data 00000000 00800060 000002ee 00000362 2**0 + 1 .data 00000000 00800060 000003ae 00000422 2**0 CONTENTS, ALLOC, LOAD, DATA - 2 .stab 000006b4 00000000 00000000 00000364 2**2 + 2 .stab 000006b4 00000000 00000000 00000424 2**2 CONTENTS, READONLY, DEBUGGING - 3 .stabstr 00000082 00000000 00000000 00000a18 2**0 + 3 .stabstr 00000082 00000000 00000000 00000ad8 2**0 CONTENTS, READONLY, DEBUGGING - 4 .comment 0000002f 00000000 00000000 00000a9a 2**0 + 4 .comment 0000002f 00000000 00000000 00000b5a 2**0 CONTENTS, READONLY - 5 .debug_aranges 00000080 00000000 00000000 00000ac9 2**0 + 5 .debug_aranges 00000080 00000000 00000000 00000b89 2**0 CONTENTS, READONLY, DEBUGGING - 6 .debug_info 00001b2b 00000000 00000000 00000b49 2**0 + 6 .debug_info 00001b24 00000000 00000000 00000c09 2**0 CONTENTS, READONLY, DEBUGGING - 7 .debug_abbrev 00000246 00000000 00000000 00002674 2**0 + 7 .debug_abbrev 00000246 00000000 00000000 0000272d 2**0 CONTENTS, READONLY, DEBUGGING - 8 .debug_line 00000554 00000000 00000000 000028ba 2**0 + 8 .debug_line 00000554 00000000 00000000 00002973 2**0 CONTENTS, READONLY, DEBUGGING - 9 .debug_frame 000001dc 00000000 00000000 00002e10 2**2 + 9 .debug_frame 000001dc 00000000 00000000 00002ec8 2**2 CONTENTS, READONLY, DEBUGGING - 10 .debug_str 000001cf 00000000 00000000 00002fec 2**0 + 10 .debug_str 000001cf 00000000 00000000 000030a4 2**0 CONTENTS, READONLY, DEBUGGING - 11 .debug_loc 00000847 00000000 00000000 000031bb 2**0 + 11 .debug_loc 00000847 00000000 00000000 00003273 2**0 CONTENTS, READONLY, DEBUGGING - 12 .debug_ranges 00000118 00000000 00000000 00003a02 2**0 + 12 .debug_ranges 00000118 00000000 00000000 00003aba 2**0 CONTENTS, READONLY, DEBUGGING Disassembly of section .text: @@ -74,8 +74,8 @@ Disassembly of section .text: 3c: a0 36 cpi r26, 0x60 ; 96 3e: b2 07 cpc r27, r18 40: e1 f7 brne .-8 ; 0x3a <.do_clear_bss_loop> - 42: 4b d1 rcall .+662 ; 0x2da
- 44: 52 c1 rjmp .+676 ; 0x2ea <_exit> + 42: ac d1 rcall .+856 ; 0x39c
+ 44: b2 c1 rjmp .+868 ; 0x3aa <_exit> 00000046 <__bad_interrupt>: 46: dc cf rjmp .-72 ; 0x0 <__vectors> @@ -417,104 +417,224 @@ void initschalter(void) 262: 00 00 nop 264: 08 95 ret -00000266 : - _delay_ms(10); +00000266 : + rgbl(LED2, 0, 0, 0); + }*/ } - -void programRainbow(uint8_t t) +#define WAIT_WARN_BLINK 40 +void programWarnBlink(void) { 266: cf 93 push r28 - 268: c8 2f mov r28, r24 - fade(LED1 | LED2 | LED3 | LED4, RED, YELLOW, t); - 26a: 28 2f mov r18, r24 - 26c: 30 e0 ldi r19, 0x00 ; 0 - 26e: 43 e0 ldi r20, 0x03 ; 3 - 270: 50 e0 ldi r21, 0x00 ; 0 - 272: 61 e0 ldi r22, 0x01 ; 1 - 274: 70 e0 ldi r23, 0x00 ; 0 - 276: 8f e0 ldi r24, 0x0F ; 15 - 278: 90 e0 ldi r25, 0x00 ; 0 - 27a: 16 df rcall .-468 ; 0xa8 - fade(LED1 | LED2 | LED3 | LED4, YELLOW, GREEN, t); - 27c: 2c 2f mov r18, r28 - 27e: 30 e0 ldi r19, 0x00 ; 0 - 280: 42 e0 ldi r20, 0x02 ; 2 - 282: 50 e0 ldi r21, 0x00 ; 0 - 284: 63 e0 ldi r22, 0x03 ; 3 - 286: 70 e0 ldi r23, 0x00 ; 0 - 288: 8f e0 ldi r24, 0x0F ; 15 - 28a: 90 e0 ldi r25, 0x00 ; 0 - 28c: 0d df rcall .-486 ; 0xa8 - fade(LED1 | LED2 | LED3 | LED4, GREEN, CYAN, t); - 28e: 2c 2f mov r18, r28 - 290: 30 e0 ldi r19, 0x00 ; 0 - 292: 46 e0 ldi r20, 0x06 ; 6 - 294: 50 e0 ldi r21, 0x00 ; 0 - 296: 62 e0 ldi r22, 0x02 ; 2 - 298: 70 e0 ldi r23, 0x00 ; 0 - 29a: 8f e0 ldi r24, 0x0F ; 15 - 29c: 90 e0 ldi r25, 0x00 ; 0 - 29e: 04 df rcall .-504 ; 0xa8 - fade(LED1 | LED2 | LED3 | LED4, CYAN, BLUE, t); - 2a0: 2c 2f mov r18, r28 - 2a2: 30 e0 ldi r19, 0x00 ; 0 - 2a4: 44 e0 ldi r20, 0x04 ; 4 - 2a6: 50 e0 ldi r21, 0x00 ; 0 - 2a8: 66 e0 ldi r22, 0x06 ; 6 - 2aa: 70 e0 ldi r23, 0x00 ; 0 - 2ac: 8f e0 ldi r24, 0x0F ; 15 - 2ae: 90 e0 ldi r25, 0x00 ; 0 - 2b0: fb de rcall .-522 ; 0xa8 - fade(LED1 | LED2 | LED3 | LED4, BLUE, MAGENTA, t); - 2b2: 2c 2f mov r18, r28 - 2b4: 30 e0 ldi r19, 0x00 ; 0 - 2b6: 45 e0 ldi r20, 0x05 ; 5 - 2b8: 50 e0 ldi r21, 0x00 ; 0 - 2ba: 64 e0 ldi r22, 0x04 ; 4 - 2bc: 70 e0 ldi r23, 0x00 ; 0 - 2be: 8f e0 ldi r24, 0x0F ; 15 - 2c0: 90 e0 ldi r25, 0x00 ; 0 - 2c2: f2 de rcall .-540 ; 0xa8 - fade(LED1 | LED2 | LED3 | LED4, MAGENTA, RED, t); - 2c4: 2c 2f mov r18, r28 - 2c6: 30 e0 ldi r19, 0x00 ; 0 - 2c8: 41 e0 ldi r20, 0x01 ; 1 - 2ca: 50 e0 ldi r21, 0x00 ; 0 - 2cc: 65 e0 ldi r22, 0x05 ; 5 - 2ce: 70 e0 ldi r23, 0x00 ; 0 - 2d0: 8f e0 ldi r24, 0x0F ; 15 - 2d2: 90 e0 ldi r25, 0x00 ; 0 - 2d4: e9 de rcall .-558 ; 0xa8 + 268: c5 e0 ldi r28, 0x05 ; 5 + uint8_t const blinks = 5; + uint8_t const waits = 5; + for(uint8_t i=0;i + 274: 2f ef ldi r18, 0xFF ; 255 + 276: 80 e7 ldi r24, 0x70 ; 112 + 278: 92 e0 ldi r25, 0x02 ; 2 + 27a: 21 50 subi r18, 0x01 ; 1 + 27c: 80 40 sbci r24, 0x00 ; 0 + 27e: 90 40 sbci r25, 0x00 ; 0 + 280: e1 f7 brne .-8 ; 0x27a + 282: 00 c0 rjmp .+0 ; 0x284 + 284: 00 00 nop + _delay_ms(WAIT_WARN_BLINK); + ledg(LED2 | LED4, BLACK); + 286: 60 e0 ldi r22, 0x00 ; 0 + 288: 70 e0 ldi r23, 0x00 ; 0 + 28a: 8a e0 ldi r24, 0x0A ; 10 + 28c: 90 e0 ldi r25, 0x00 ; 0 + 28e: dc de rcall .-584 ; 0x48 + 290: 2f ef ldi r18, 0xFF ; 255 + 292: 80 e7 ldi r24, 0x70 ; 112 + 294: 92 e0 ldi r25, 0x02 ; 2 + 296: 21 50 subi r18, 0x01 ; 1 + 298: 80 40 sbci r24, 0x00 ; 0 + 29a: 90 40 sbci r25, 0x00 ; 0 + 29c: e1 f7 brne .-8 ; 0x296 + 29e: 00 c0 rjmp .+0 ; 0x2a0 + 2a0: 00 00 nop + 2a2: c1 50 subi r28, 0x01 ; 1 +#define WAIT_WARN_BLINK 40 +void programWarnBlink(void) +{ + uint8_t const blinks = 5; + uint8_t const waits = 5; + for(uint8_t i=0;i + 2a6: 2f ef ldi r18, 0xFF ; 255 + 2a8: 80 e7 ldi r24, 0x70 ; 112 + 2aa: 92 e0 ldi r25, 0x02 ; 2 + 2ac: 21 50 subi r18, 0x01 ; 1 + 2ae: 80 40 sbci r24, 0x00 ; 0 + 2b0: 90 40 sbci r25, 0x00 ; 0 + 2b2: e1 f7 brne .-8 ; 0x2ac + 2b4: 00 c0 rjmp .+0 ; 0x2b6 + 2b6: 00 00 nop + 2b8: 2f ef ldi r18, 0xFF ; 255 + 2ba: 80 e7 ldi r24, 0x70 ; 112 + 2bc: 92 e0 ldi r25, 0x02 ; 2 + 2be: 21 50 subi r18, 0x01 ; 1 + 2c0: 80 40 sbci r24, 0x00 ; 0 + 2c2: 90 40 sbci r25, 0x00 ; 0 + 2c4: e1 f7 brne .-8 ; 0x2be + 2c6: 00 c0 rjmp .+0 ; 0x2c8 + 2c8: 00 00 nop + 2ca: 2f ef ldi r18, 0xFF ; 255 + 2cc: 80 e7 ldi r24, 0x70 ; 112 + 2ce: 92 e0 ldi r25, 0x02 ; 2 + 2d0: 21 50 subi r18, 0x01 ; 1 + 2d2: 80 40 sbci r24, 0x00 ; 0 + 2d4: 90 40 sbci r25, 0x00 ; 0 + 2d6: e1 f7 brne .-8 ; 0x2d0 + 2d8: 00 c0 rjmp .+0 ; 0x2da + 2da: 00 00 nop + 2dc: 2f ef ldi r18, 0xFF ; 255 + 2de: 80 e7 ldi r24, 0x70 ; 112 + 2e0: 92 e0 ldi r25, 0x02 ; 2 + 2e2: 21 50 subi r18, 0x01 ; 1 + 2e4: 80 40 sbci r24, 0x00 ; 0 + 2e6: 90 40 sbci r25, 0x00 ; 0 + 2e8: e1 f7 brne .-8 ; 0x2e2 + 2ea: 00 c0 rjmp .+0 ; 0x2ec + 2ec: 00 00 nop + 2ee: 2f ef ldi r18, 0xFF ; 255 + 2f0: 80 e7 ldi r24, 0x70 ; 112 + 2f2: 92 e0 ldi r25, 0x02 ; 2 + 2f4: 21 50 subi r18, 0x01 ; 1 + 2f6: 80 40 sbci r24, 0x00 ; 0 + 2f8: 90 40 sbci r25, 0x00 ; 0 + 2fa: e1 f7 brne .-8 ; 0x2f4 + 2fc: 00 c0 rjmp .+0 ; 0x2fe + 2fe: 00 00 nop + 300: c5 e0 ldi r28, 0x05 ; 5 + 302: 2f ef ldi r18, 0xFF ; 255 + 304: 80 e7 ldi r24, 0x70 ; 112 + 306: 92 e0 ldi r25, 0x02 ; 2 + 308: 21 50 subi r18, 0x01 ; 1 + 30a: 80 40 sbci r24, 0x00 ; 0 + 30c: 90 40 sbci r25, 0x00 ; 0 + 30e: e1 f7 brne .-8 ; 0x308 + 310: 00 c0 rjmp .+0 ; 0x312 + 312: 00 00 nop + for (uint8_t i=0;i + 31e: 2f ef ldi r18, 0xFF ; 255 + 320: 80 e7 ldi r24, 0x70 ; 112 + 322: 92 e0 ldi r25, 0x02 ; 2 + 324: 21 50 subi r18, 0x01 ; 1 + 326: 80 40 sbci r24, 0x00 ; 0 + 328: 90 40 sbci r25, 0x00 ; 0 + 32a: e1 f7 brne .-8 ; 0x324 + 32c: 00 c0 rjmp .+0 ; 0x32e + 32e: 00 00 nop + _delay_ms(WAIT_WARN_BLINK); + ledg(LED3, BLACK); + 330: 60 e0 ldi r22, 0x00 ; 0 + 332: 70 e0 ldi r23, 0x00 ; 0 + 334: 84 e0 ldi r24, 0x04 ; 4 + 336: 90 e0 ldi r25, 0x00 ; 0 + 338: 87 de rcall .-754 ; 0x48 + 33a: c1 50 subi r28, 0x01 ; 1 + _delay_ms(WAIT_WARN_BLINK); + } + for (uint8_t i=0;i + 33e: 2f ef ldi r18, 0xFF ; 255 + 340: 80 e7 ldi r24, 0x70 ; 112 + 342: 92 e0 ldi r25, 0x02 ; 2 + 344: 21 50 subi r18, 0x01 ; 1 + 346: 80 40 sbci r24, 0x00 ; 0 + 348: 90 40 sbci r25, 0x00 ; 0 + 34a: e1 f7 brne .-8 ; 0x344 + 34c: 00 c0 rjmp .+0 ; 0x34e + 34e: 00 00 nop + 350: 2f ef ldi r18, 0xFF ; 255 + 352: 80 e7 ldi r24, 0x70 ; 112 + 354: 92 e0 ldi r25, 0x02 ; 2 + 356: 21 50 subi r18, 0x01 ; 1 + 358: 80 40 sbci r24, 0x00 ; 0 + 35a: 90 40 sbci r25, 0x00 ; 0 + 35c: e1 f7 brne .-8 ; 0x356 + 35e: 00 c0 rjmp .+0 ; 0x360 + 360: 00 00 nop + 362: 2f ef ldi r18, 0xFF ; 255 + 364: 80 e7 ldi r24, 0x70 ; 112 + 366: 92 e0 ldi r25, 0x02 ; 2 + 368: 21 50 subi r18, 0x01 ; 1 + 36a: 80 40 sbci r24, 0x00 ; 0 + 36c: 90 40 sbci r25, 0x00 ; 0 + 36e: e1 f7 brne .-8 ; 0x368 + 370: 00 c0 rjmp .+0 ; 0x372 + 372: 00 00 nop + 374: 2f ef ldi r18, 0xFF ; 255 + 376: 80 e7 ldi r24, 0x70 ; 112 + 378: 92 e0 ldi r25, 0x02 ; 2 + 37a: 21 50 subi r18, 0x01 ; 1 + 37c: 80 40 sbci r24, 0x00 ; 0 + 37e: 90 40 sbci r25, 0x00 ; 0 + 380: e1 f7 brne .-8 ; 0x37a + 382: 00 c0 rjmp .+0 ; 0x384 + 384: 00 00 nop + 386: 2f ef ldi r18, 0xFF ; 255 + 388: 80 e7 ldi r24, 0x70 ; 112 + 38a: 92 e0 ldi r25, 0x02 ; 2 + 38c: 21 50 subi r18, 0x01 ; 1 + 38e: 80 40 sbci r24, 0x00 ; 0 + 390: 90 40 sbci r25, 0x00 ; 0 + 392: e1 f7 brne .-8 ; 0x38c + 394: 00 c0 rjmp .+0 ; 0x396 + 396: 00 00 nop + ledg(LED3, BLACK); + } + for (uint8_t i=0;i: +0000039c
: _delay_ms(150); } int main(void) { DDRB = 0b00111111; - 2da: 8f e3 ldi r24, 0x3F ; 63 - 2dc: 87 bb out 0x17, r24 ; 23 + 39c: 8f e3 ldi r24, 0x3F ; 63 + 39e: 87 bb out 0x17, r24 ; 23 DDRD = 0b00111111; - 2de: 81 bb out 0x11, r24 ; 17 + 3a0: 81 bb out 0x11, r24 ; 17 initschalter(); - 2e0: b7 df rcall .-146 ; 0x250 + 3a2: 56 df rcall .-340 ; 0x250 initleds(); - 2e2: 40 df rcall .-384 ; 0x164 + 3a4: df de rcall .-578 ; 0x164 while(1) { - //programWarnBlink(); - //programColorFull(); - programRainbow(100); - 2e4: 84 e6 ldi r24, 0x64 ; 100 - 2e6: bf df rcall .-130 ; 0x266 - 2e8: fd cf rjmp .-6 ; 0x2e4 + programWarnBlink(); + 3a6: 5f df rcall .-322 ; 0x266 + 3a8: fe cf rjmp .-4 ; 0x3a6 -000002ea <_exit>: - 2ea: f8 94 cli +000003aa <_exit>: + 3aa: f8 94 cli -000002ec <__stop_program>: - 2ec: ff cf rjmp .-2 ; 0x2ec <__stop_program> +000003ac <__stop_program>: + 3ac: ff cf rjmp .-2 ; 0x3ac <__stop_program> diff --git a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.map b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.map index 8a855ec..c66b04e 100644 --- a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.map +++ b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.map @@ -13,12 +13,12 @@ Discarded input sections .text.rgbl 0x00000000 0x76 Leuchtklotz.o .text.programColorFull 0x00000000 0x7a Leuchtklotz.o + .text.programRainbow + 0x00000000 0x74 Leuchtklotz.o .text.programWarnYellow 0x00000000 0x86 Leuchtklotz.o .text.programCop 0x00000000 0xa6 Leuchtklotz.o - .text.programWarnBlink - 0x00000000 0x136 Leuchtklotz.o .text.programHacker 0x00000000 0x196 Leuchtklotz.o .text.programGreenBlink @@ -163,7 +163,7 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 .rela.plt *(.rela.plt) -.text 0x00000000 0x2ee +.text 0x00000000 0x3ae *(.vectors) .vectors 0x00000000 0x2a 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/avr25/tiny-stack/crttn2313a.o 0x00000000 __vector_default @@ -250,16 +250,16 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 .text.initschalter 0x00000250 0x16 Leuchtklotz.o 0x00000250 initschalter - .text.programRainbow - 0x00000266 0x74 Leuchtklotz.o - 0x00000266 programRainbow - .text.main 0x000002da 0x10 Leuchtklotz.o - 0x000002da main - 0x000002ea . = ALIGN (0x2) + .text.programWarnBlink + 0x00000266 0x136 Leuchtklotz.o + 0x00000266 programWarnBlink + .text.main 0x0000039c 0xe Leuchtklotz.o + 0x0000039c main + 0x000003aa . = ALIGN (0x2) *(.fini9) - .fini9 0x000002ea 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/avr25/tiny-stack\libgcc.a(_exit.o) - 0x000002ea _exit - 0x000002ea exit + .fini9 0x000003aa 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/avr25/tiny-stack\libgcc.a(_exit.o) + 0x000003aa _exit + 0x000003aa exit *(.fini9) *(.fini8) *(.fini8) @@ -278,11 +278,11 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 *(.fini1) *(.fini1) *(.fini0) - .fini0 0x000002ea 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/avr25/tiny-stack\libgcc.a(_exit.o) + .fini0 0x000003aa 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/avr25/tiny-stack\libgcc.a(_exit.o) *(.fini0) - 0x000002ee _etext = . + 0x000003ae _etext = . -.data 0x00800060 0x0 load address 0x000002ee +.data 0x00800060 0x0 load address 0x000003ae 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/avr25/tiny-stack/crttn2313a.o @@ -303,8 +303,8 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 *(.bss*) *(COMMON) 0x00800060 PROVIDE (__bss_end, .) - 0x000002ee __data_load_start = LOADADDR (.data) - 0x000002ee __data_load_end = (__data_load_start + SIZEOF (.data)) + 0x000003ae __data_load_start = LOADADDR (.data) + 0x000003ae __data_load_end = (__data_load_start + SIZEOF (.data)) .noinit 0x00800060 0x0 0x00800060 PROVIDE (__noinit_start, .) @@ -377,9 +377,9 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8 .debug_pubnames *(.debug_pubnames) -.debug_info 0x00000000 0x1b2b +.debug_info 0x00000000 0x1b24 *(.debug_info) - .debug_info 0x00000000 0x1b2b Leuchtklotz.o + .debug_info 0x00000000 0x1b24 Leuchtklotz.o *(.gnu.linkonce.wi.*) .debug_abbrev 0x00000000 0x246 diff --git a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.srec b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.srec index 0906652..1b43450 100644 --- a/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.srec +++ b/Leuchtklotz/Leuchtklotz/Debug/Leuchtklotz.srec @@ -3,7 +3,7 @@ S113000014C021C020C01FC01EC01DC01CC01BC006 S11300101AC019C018C017C016C015C014C013C028 S113002012C011C010C00FC00EC011241FBECFEDEE S1130030CDBF20E0A0E6B0E001C01D92A036B2071B -S1130040E1F74BD152C1DCCF6770772780FF06C040 +S1130040E1F7ACD1B2C1DCCF6770772780FF06C07F S113005098B3987F98BB98B3962B98BB81FF0DC03B S113006098B3977C98BB98B39B01220F331F220F40 S1130070331F220F331F292B28BB82FF06C092B3E4 @@ -37,13 +37,25 @@ S11302209FE724E88EE1915020408040E1F700C030 S1130230000025E030E047E050E066E070E08FE049 S113024090E032DF60E070E08FE090E0FDDE089542 S113025088B3806C88BB969A8FE493EC0197F1F78E -S113026000C000000895CF93C82F282F30E043E04A -S113027050E061E070E08FE090E016DF2C2F30E07A -S113028042E050E063E070E08FE090E00DDF2C2F5F -S113029030E046E050E062E070E08FE090E004DFA0 -S11302A02C2F30E044E050E066E070E08FE090E016 -S11302B0FBDE2C2F30E045E050E064E070E08FE09E -S11302C090E0F2DE2C2F30E041E050E065E070E099 -S11302D08FE090E0E9DECF9108958FE387BB81BB87 -S11102E0B7DF40DF84E6BFDFFDCFF894FFCF29 +S113026000C000000895CF93C5E063E070E08AE029 +S113027090E0EADE2FEF80E792E02150804090404A +S1130280E1F700C0000060E070E08AE090E0DCDEAE +S11302902FEF80E792E0215080409040E1F700C0CA +S11302A00000C15011F72FEF80E792E02150804009 +S11302B09040E1F700C000002FEF80E792E021506A +S11302C080409040E1F700C000002FEF80E792E00B +S11302D0215080409040E1F700C000002FEF80E7FC +S11302E092E0215080409040E1F700C000002FEFE1 +S11302F080E792E0215080409040E1F700C0000088 +S1130300C5E02FEF80E792E0215080409040E1F774 +S113031000C0000061E070E084E090E095DE2FEF23 +S113032080E792E0215080409040E1F700C0000057 +S113033060E070E084E090E087DEC15011F72FEFB9 +S113034080E792E0215080409040E1F700C0000037 +S11303502FEF80E792E0215080409040E1F700C009 +S113036000002FEF80E792E0215080409040E1F7B9 +S113037000C000002FEF80E792E0215080409040C1 +S1130380E1F700C000002FEF80E792E021508040A9 +S11303909040E1F700C00000CF9108958FE387BB40 +S11103A081BB56DFDFDE5FDFFECFF894FFCFB8 S9030000FC diff --git a/Leuchtklotz/Leuchtklotz/Leuchtklotz.c b/Leuchtklotz/Leuchtklotz/Leuchtklotz.c index cbedb09..a5a2fa9 100644 --- a/Leuchtklotz/Leuchtklotz/Leuchtklotz.c +++ b/Leuchtklotz/Leuchtklotz/Leuchtklotz.c @@ -322,9 +322,9 @@ int main(void) initleds(); while(1) { - //programWarnBlink(); + programWarnBlink(); //programColorFull(); - programRainbow(100); + //programRainbow(10); //programWarnYellow(); //programCop(); //programHacker(); diff --git a/Leuchtklotz/Leuchtklotz/Leuchtklotz.cproj b/Leuchtklotz/Leuchtklotz/Leuchtklotz.cproj index 8fe752f..eee0bb9 100644 --- a/Leuchtklotz/Leuchtklotz/Leuchtklotz.cproj +++ b/Leuchtklotz/Leuchtklotz/Leuchtklotz.cproj @@ -30,7 +30,7 @@ 127.0.0.1 - 65413 + 10872 False @@ -40,7 +40,7 @@ 0000000000000 127.0.0.1 - 65413 + 10872 False