Bastelleien/Uhr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

20131211-181002

Browse Source
This commit is contained in:
BlubbFish
2013-12-11 17:09:50 +00:00
parent 64b1bd8c1b
commit 11933f0506
16 changed files with 711 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Mainboard/Mainboard/Debug/Mainboard.elf
BIN
View File
Binary file not shown.
Mainboard/Mainboard/Debug/Mainboard.hex
+14 -14
View File
@@ -5,8 +5,8 @@
:100040000C9453000C9453000C9453000C945300E4
:100050000C945300F80011241FBECFE5D4E0DEBF9E
:10006000CDBF10E0A0E6B0E0EAEDF7E002C00590F9
:100070000D92AE37B107D9F720E0AEE7B0E001C08E
:100080001D92A238B207E1F710E0C6E5D0E004C047
:100070000D92A038B107D9F720E0A0E8B0E001C0A8
:100080001D92A438B207E1F710E0C6E5D0E004C045
:100090002297FE010E940401C435D107C9F70E94CE
:1000A00065000C94EB030C940000FC0103C05D9B05
:1000B000FECF8CB981918111FACF089585E083BF7D
@@ -15,21 +15,21 @@
:1000E000215030408040E1F700C00000F3CF1F9264
:1000F0000F920FB60F9211240F931F932F933F93DC
:100100004F935F936F937F938F939F93AF93BF931F
:10011000EF93FF93CF93DF93CDB7DEB72C97DEBF7E
:10012000CDBF80918100813220F48F5F8093810068
:1001300044C01092810080917E001F928F93809125
:100140007F001F928F93809160001F928F9381E6B2
:1001500090E09F938F931F928CE08F938E010F5F9F
:10011000EF93FF93CF93DF93CDB7DEB72F97DEBF7B
:10012000CDBF80918300813220F48F5F8093830064
:1001300044C010928300809180001F928F93809121
:1001400081001F928F93809160001F928F9381E6B0
:1001500090E09F938F931F928FE08F938E010F5F9C
:100160001F4F1F930F930E940801C8010E94550062
:1001700080917E008F5F0FB6F894DEBF0FBECDBFBB
:100180008C3318F480937E0007C010927E0080911B
:100190007F008F5F80937F0080917F008C3338F0E9
:1001A00010927F00809160008F5F8093600080914B
:1001B0006000883110F0109260002C960FB6F89411
:10017000809180008F5F0FB6F894DEBF0FBECDBFB9
:100180008C3318F48093800007C010928000809117
:1001900081008F5F80938100809181008C3338F0E3
:1001A00010928100809160008F5F80936000809149
:1001B0006000883110F0109260002F960FB6F8940E
:1001C000DEBF0FBECDBFDF91CF91FF91EF91BF9109
:1001D000AF919F918F917F916F915F914F913F91DF
:1001E0002F911F910F910F900FBE0F901F90189598
:1001F00086E080BD539A10BC83E389B982E790E022
:1001F00086E080BD539A10BC83E389B983E790E021
:100200000C945500EE0FFF1F0590F491E02D09941A
:10021000AEE0B0E0EEE0F1E00C94C2030D891E897F
:100220008F89988D26E02C831A83098397FF02C05B
@@ -125,5 +125,5 @@
:1007C000AA81B981CE0FD11D0FB6F894DEBF0FBE3E
:0A07D000CDBFED010895F894FFCFAE
:1007DA000C74253032643A253032643A253032645A
:0E07EA000A005561727420646F6E65210A006A
:1007EA000D0A005561727420646F6E65210A00005B
:00000001FF
Mainboard/Mainboard/Debug/Mainboard.lss
+36 -36
View File
@@ -5,31 +5,31 @@ Sections:
Idx Name Size VMA LMA File off Algn
0 .text 000007da 00000000 00000000 00000094 2**1
CONTENTS, ALLOC, LOAD, READONLY, CODE
1 .data 0000001e 00800060 000007da 0000086e 2**0
1 .data 00000020 00800060 000007da 0000086e 2**0
CONTENTS, ALLOC, LOAD, DATA
2 .bss 00000004 0080007e 0080007e 0000088c 2**0
2 .bss 00000004 00800080 00800080 0000088e 2**0
ALLOC
3 .stab 00000c84 00000000 00000000 0000088c 2**2
3 .stab 00000c84 00000000 00000000 00000890 2**2
CONTENTS, READONLY, DEBUGGING
4 .stabstr 000001aa 00000000 00000000 00001510 2**0
4 .stabstr 000001aa 00000000 00000000 00001514 2**0
CONTENTS, READONLY, DEBUGGING
5 .comment 0000002f 00000000 00000000 000016ba 2**0
5 .comment 0000002f 00000000 00000000 000016be 2**0
CONTENTS, READONLY
6 .debug_aranges 000000a0 00000000 00000000 000016e9 2**0
6 .debug_aranges 000000a0 00000000 00000000 000016ed 2**0
CONTENTS, READONLY, DEBUGGING
7 .debug_info 00000f20 00000000 00000000 00001789 2**0
7 .debug_info 00000f20 00000000 00000000 0000178d 2**0
CONTENTS, READONLY, DEBUGGING
8 .debug_abbrev 0000078d 00000000 00000000 000026a9 2**0
8 .debug_abbrev 0000078d 00000000 00000000 000026ad 2**0
CONTENTS, READONLY, DEBUGGING
9 .debug_line 000007f9 00000000 00000000 00002e36 2**0
9 .debug_line 000007f9 00000000 00000000 00002e3a 2**0
CONTENTS, READONLY, DEBUGGING
10 .debug_frame 00000178 00000000 00000000 00003630 2**2
10 .debug_frame 00000178 00000000 00000000 00003634 2**2
CONTENTS, READONLY, DEBUGGING
11 .debug_str 00000510 00000000 00000000 000037a8 2**0
11 .debug_str 00000510 00000000 00000000 000037ac 2**0
CONTENTS, READONLY, DEBUGGING
12 .debug_loc 000007d2 00000000 00000000 00003cb8 2**0
12 .debug_loc 000007d2 00000000 00000000 00003cbc 2**0
CONTENTS, READONLY, DEBUGGING
13 .debug_ranges 00000060 00000000 00000000 0000448a 2**0
13 .debug_ranges 00000060 00000000 00000000 0000448e 2**0
CONTENTS, READONLY, DEBUGGING
Disassembly of section .text:
@@ -77,13 +77,13 @@ Disassembly of section .text:
6c: 02 c0 rjmp .+4 ; 0x72 <__do_copy_data+0x10>
6e: 05 90 lpm r0, Z+
70: 0d 92 st X+, r0
72: ae 37 cpi r26, 0x7E ; 126
72: a0 38 cpi r26, 0x80 ; 128
74: b1 07 cpc r27, r17
76: d9 f7 brne .-10 ; 0x6e <__do_copy_data+0xc>
00000078 <__do_clear_bss>:
78: 20 e0 ldi r18, 0x00 ; 0
7a: ae e7 ldi r26, 0x7E ; 126
7a: a0 e8 ldi r26, 0x80 ; 128
7c: b0 e0 ldi r27, 0x00 ; 0
7e: 01 c0 rjmp .+2 ; 0x82 <.do_clear_bss_start>
@@ -91,7 +91,7 @@ Disassembly of section .text:
80: 1d 92 st X+, r1
00000082 <.do_clear_bss_start>:
82: a2 38 cpi r26, 0x82 ; 130
82: a4 38 cpi r26, 0x84 ; 132
84: b2 07 cpc r27, r18
86: e1 f7 brne .-8 ; 0x80 <.do_clear_bss_loop>
@@ -247,24 +247,24 @@ ISR(TIMER0_OVF_vect) {
116: df 93 push r29
118: cd b7 in r28, 0x3d ; 61
11a: de b7 in r29, 0x3e ; 62
11c: 2c 97 sbiw r28, 0x0c ; 12
11c: 2f 97 sbiw r28, 0x0f ; 15
11e: de bf out 0x3e, r29 ; 62
120: cd bf out 0x3d, r28 ; 61
if(timer++ > 32) {
122: 80 91 81 00 lds r24, 0x0081
122: 80 91 83 00 lds r24, 0x0083
126: 81 32 cpi r24, 0x21 ; 33
128: 20 f4 brcc .+8 ; 0x132 <__vector_9+0x44>
12a: 8f 5f subi r24, 0xFF ; 255
12c: 80 93 81 00 sts 0x0081, r24
12c: 80 93 83 00 sts 0x0083, r24
130: 44 c0 rjmp .+136 ; 0x1ba <__vector_9+0xcc>
timer = 0;
132: 10 92 81 00 sts 0x0081, r1
char t[12];
snprintf(t, sizeof(t), "t%02d:%02d:%02d\n", h, m, s);
136: 80 91 7e 00 lds r24, 0x007E
132: 10 92 83 00 sts 0x0083, r1
char t[15];
snprintf(t, sizeof(t), "t%02d:%02d:%02d\r\n", h, m, s);
136: 80 91 80 00 lds r24, 0x0080
13a: 1f 92 push r1
13c: 8f 93 push r24
13e: 80 91 7f 00 lds r24, 0x007F
13e: 80 91 81 00 lds r24, 0x0081
142: 1f 92 push r1
144: 8f 93 push r24
146: 80 91 60 00 lds r24, 0x0060
@@ -275,7 +275,7 @@ ISR(TIMER0_OVF_vect) {
152: 9f 93 push r25
154: 8f 93 push r24
156: 1f 92 push r1
158: 8c e0 ldi r24, 0x0C ; 12
158: 8f e0 ldi r24, 0x0F ; 15
15a: 8f 93 push r24
15c: 8e 01 movw r16, r28
15e: 0f 5f subi r16, 0xFF ; 255
@@ -287,7 +287,7 @@ ISR(TIMER0_OVF_vect) {
16a: c8 01 movw r24, r16
16c: 0e 94 55 00 call 0xaa ; 0xaa <_ZN4UartILm9600EE4sendEPKc.isra.2>
s++;
170: 80 91 7e 00 lds r24, 0x007E
170: 80 91 80 00 lds r24, 0x0080
174: 8f 5f subi r24, 0xFF ; 255
if(s >= 60) {
176: 0f b6 in r0, 0x3f ; 63
@@ -299,26 +299,26 @@ ISR(TIMER0_OVF_vect) {
182: 18 f4 brcc .+6 ; 0x18a <__vector_9+0x9c>
if(timer++ > 32) {
timer = 0;
char t[12];
snprintf(t, sizeof(t), "t%02d:%02d:%02d\n", h, m, s);
char t[15];
snprintf(t, sizeof(t), "t%02d:%02d:%02d\r\n", h, m, s);
u.send(t);
s++;
184: 80 93 7e 00 sts 0x007E, r24
184: 80 93 80 00 sts 0x0080, r24
188: 07 c0 rjmp .+14 ; 0x198 <__vector_9+0xaa>
if(s >= 60) {
s = 0;
18a: 10 92 7e 00 sts 0x007E, r1
18a: 10 92 80 00 sts 0x0080, r1
m++;
18e: 80 91 7f 00 lds r24, 0x007F
18e: 80 91 81 00 lds r24, 0x0081
192: 8f 5f subi r24, 0xFF ; 255
194: 80 93 7f 00 sts 0x007F, r24
194: 80 93 81 00 sts 0x0081, r24
}
if(m >= 60) {
198: 80 91 7f 00 lds r24, 0x007F
198: 80 91 81 00 lds r24, 0x0081
19c: 8c 33 cpi r24, 0x3C ; 60
19e: 38 f0 brcs .+14 ; 0x1ae <__vector_9+0xc0>
m = 0;
1a0: 10 92 7f 00 sts 0x007F, r1
1a0: 10 92 81 00 sts 0x0081, r1
h++;
1a4: 80 91 60 00 lds r24, 0x0060
1a8: 8f 5f subi r24, 0xFF ; 255
@@ -332,7 +332,7 @@ ISR(TIMER0_OVF_vect) {
1b6: 10 92 60 00 sts 0x0060, r1
}
}
1ba: 2c 96 adiw r28, 0x0c ; 12
1ba: 2f 96 adiw r28, 0x0f ; 15
1bc: 0f b6 in r0, 0x3f ; 63
1be: f8 94 cli
1c0: de bf out 0x3e, r29 ; 62
@@ -379,7 +379,7 @@ class Uart {
Uart() {
init();
send("Uart done!\n");
1fc: 82 e7 ldi r24, 0x72 ; 114
1fc: 83 e7 ldi r24, 0x73 ; 115
1fe: 90 e0 ldi r25, 0x00 ; 0
200: 0c 94 55 00 jmp 0xaa ; 0xaa <_ZN4UartILm9600EE4sendEPKc.isra.2>
Mainboard/Mainboard/Debug/Mainboard.map
+20 -19
View File
@@ -393,7 +393,7 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8
*(.fini0)
0x000007da _etext = .
.data 0x00800060 0x1e load address 0x000007da
.data 0x00800060 0x20 load address 0x000007da
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/crtm16a.o
@@ -416,32 +416,33 @@ LOAD c:/program files (x86)/atmel/atmel toolchain/avr8 gcc/native/3.4.2.876/avr8
*(.rodata)
*(.rodata*)
.rodata.str1.1
0x00800061 0x1d Mainboard.o
0x00800061 0x1e Mainboard.o
*(.gnu.linkonce.d*)
0x0080007e . = ALIGN (0x2)
0x0080007e _edata = .
0x0080007e PROVIDE (__data_end, .)
0x00800080 . = ALIGN (0x2)
*fill* 0x0080007f 0x1
0x00800080 _edata = .
0x00800080 PROVIDE (__data_end, .)
.bss 0x0080007e 0x4
0x0080007e PROVIDE (__bss_start, .)
.bss 0x00800080 0x4
0x00800080 PROVIDE (__bss_start, .)
*(.bss)
.bss 0x0080007e 0x4 Mainboard.o
0x0080007e s
0x0080007f m
0x00800080 u
0x00800081 timer
.bss 0x00800080 0x4 Mainboard.o
0x00800080 s
0x00800081 m
0x00800082 u
0x00800083 timer
*(.bss*)
*(COMMON)
0x00800082 PROVIDE (__bss_end, .)
0x00800084 PROVIDE (__bss_end, .)
0x000007da __data_load_start = LOADADDR (.data)
0x000007f8 __data_load_end = (__data_load_start + SIZEOF (.data))
0x000007fa __data_load_end = (__data_load_start + SIZEOF (.data))
.noinit 0x00800082 0x0
0x00800082 PROVIDE (__noinit_start, .)
.noinit 0x00800084 0x0
0x00800084 PROVIDE (__noinit_start, .)
*(.noinit*)
0x00800082 PROVIDE (__noinit_end, .)
0x00800082 _end = .
0x00800082 PROVIDE (__heap_start, .)
0x00800084 PROVIDE (__noinit_end, .)
0x00800084 _end = .
0x00800084 PROVIDE (__heap_start, .)
.eeprom 0x00810000 0x0
*(.eeprom*)
Mainboard/Mainboard/Debug/Mainboard.srec
+14 -14
View File
@@ -6,8 +6,8 @@ S11300300C9453000C9453000C9453000C945300F0
S11300400C9453000C9453000C9453000C945300E0
S11300500C945300F80011241FBECFE5D4E0DEBF9A
S1130060CDBF10E0A0E6B0E0EAEDF7E002C00590F5
S11300700D92AE37B107D9F720E0AEE7B0E001C08A
S11300801D92A238B207E1F710E0C6E5D0E004C043
S11300700D92A038B107D9F720E0A0E8B0E001C0A4
S11300801D92A438B207E1F710E0C6E5D0E004C041
S11300902297FE010E940401C435D107C9F70E94CA
S11300A065000C94EB030C940000FC0103C05D9B01
S11300B0FECF8CB981918111FACF089585E083BF79
@@ -16,21 +16,21 @@ S11300D0A09A91E085B3892785BB2FEF31EE84E0A8
S11300E0215030408040E1F700C00000F3CF1F9260
S11300F00F920FB60F9211240F931F932F933F93D8
S11301004F935F936F937F938F939F93AF93BF931B
S1130110EF93FF93CF93DF93CDB7DEB72C97DEBF7A
S1130120CDBF80918100813220F48F5F8093810064
S113013044C01092810080917E001F928F93809121
S11301407F001F928F93809160001F928F9381E6AE
S113015090E09F938F931F928CE08F938E010F5F9B
S1130110EF93FF93CF93DF93CDB7DEB72F97DEBF77
S1130120CDBF80918300813220F48F5F8093830060
S113013044C010928300809180001F928F9380911D
S113014081001F928F93809160001F928F9381E6AC
S113015090E09F938F931F928FE08F938E010F5F98
S11301601F4F1F930F930E940801C8010E9455005E
S113017080917E008F5F0FB6F894DEBF0FBECDBFB7
S11301808C3318F480937E0007C010927E00809117
S11301907F008F5F80937F0080917F008C3338F0E5
S11301A010927F00809160008F5F80936000809147
S11301B06000883110F0109260002C960FB6F8940D
S1130170809180008F5F0FB6F894DEBF0FBECDBFB5
S11301808C3318F48093800007C010928000809113
S113019081008F5F80938100809181008C3338F0DF
S11301A010928100809160008F5F80936000809145
S11301B06000883110F0109260002F960FB6F8940A
S11301C0DEBF0FBECDBFDF91CF91FF91EF91BF9105
S11301D0AF919F918F917F916F915F914F913F91DB
S11301E02F911F910F910F900FBE0F901F90189594
S11301F086E080BD539A10BC83E389B982E790E01E
S11301F086E080BD539A10BC83E389B983E790E01D
S11302000C945500EE0FFF1F0590F491E02D099416
S1130210AEE0B0E0EEE0F1E00C94C2030D891E897B
S11302208F89988D26E02C831A83098397FF02C057
@@ -126,5 +126,5 @@ S11307B0AA84B984C884DF80EE80FD800C811B810B
S11307C0AA81B981CE0FD11D0FB6F894DEBF0FBE3A
S10D07D0CDBFED010895F894FFCFAA
S11307DA0C74253032643A253032643A2530326456
S11107EA0A005561727420646F6E65210A0066
S11307EA0D0A005561727420646F6E65210A000057
S9030000FC
Mainboard/Mainboard/Mainboard.cpp
+2 -2
View File
@@ -53,8 +53,8 @@ uint8_t s = 0;
ISR(TIMER0_OVF_vect) {
if(timer++ > 32) {
timer = 0;
char t[12];
snprintf(t, sizeof(t), "t%02d:%02d:%02d\n", h, m, s);
char t[15];
snprintf(t, sizeof(t), "t%02d:%02d:%02d\r\n", h, m, s);
u.send(t);
s++;
if(s >= 60) {