Avans/MIC-KM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added more comments

Browse Source
This commit is contained in:
kennyboy55
2016-02-17 15:50:11 +01:00
parent 07034d4826
commit 6374952c98
15 changed files with 445 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MIC-Week2/Debug/MIC-Week2.lss
+234 -228
View File
@@ -3,31 +3,31 @@ MIC-Week2.elf: file format elf32-avr
Sections:
Idx Name Size VMA LMA File off Algn
0 .data 0000006c 00800100 00000294 00000328 2**0
0 .data 00000000 00800100 00800100 000002b0 2**0
CONTENTS, ALLOC, LOAD, DATA
1 .text 00000294 00000000 00000000 00000094 2**1
1 .text 0000023c 00000000 00000000 00000074 2**1
CONTENTS, ALLOC, LOAD, READONLY, CODE
2 .bss 00000004 0080016c 0080016c 00000394 2**0
2 .bss 00000002 00800100 00800100 000002b0 2**0
ALLOC
3 .comment 00000030 00000000 00000000 00000394 2**0
3 .comment 00000030 00000000 00000000 000002b0 2**0
CONTENTS, READONLY
4 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 000003c4 2**2
4 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 000002e0 2**2
CONTENTS, READONLY
5 .debug_aranges 00000078 00000000 00000000 00000400 2**0
5 .debug_aranges 00000078 00000000 00000000 0000031c 2**0
CONTENTS, READONLY, DEBUGGING
6 .debug_info 000004e3 00000000 00000000 00000478 2**0
6 .debug_info 000004e3 00000000 00000000 00000394 2**0
CONTENTS, READONLY, DEBUGGING
7 .debug_abbrev 00000277 00000000 00000000 0000095b 2**0
7 .debug_abbrev 00000277 00000000 00000000 00000877 2**0
CONTENTS, READONLY, DEBUGGING
8 .debug_line 00000392 00000000 00000000 00000bd2 2**0
8 .debug_line 00000392 00000000 00000000 00000aee 2**0
CONTENTS, READONLY, DEBUGGING
9 .debug_frame 00000184 00000000 00000000 00000f64 2**2
9 .debug_frame 00000184 00000000 00000000 00000e80 2**2
CONTENTS, READONLY, DEBUGGING
10 .debug_str 00000223 00000000 00000000 000010e8 2**0
10 .debug_str 00000218 00000000 00000000 00001004 2**0
CONTENTS, READONLY, DEBUGGING
11 .debug_loc 000003ae 00000000 00000000 0000130b 2**0
11 .debug_loc 000003ae 00000000 00000000 0000121c 2**0
CONTENTS, READONLY, DEBUGGING
12 .debug_ranges 000000b0 00000000 00000000 000016b9 2**0
12 .debug_ranges 000000b0 00000000 00000000 000015ca 2**0
CONTENTS, READONLY, DEBUGGING
Disassembly of section .text:
@@ -37,9 +37,9 @@ Disassembly of section .text:
2: 00 00 nop
4: 72 c0 rjmp .+228 ; 0xea <__vector_1>
6: 00 00 nop
8: a1 c0 rjmp .+322 ; 0x14c <__vector_2>
8: bb c0 rjmp .+374 ; 0x180 <__vector_2>
a: 00 00 nop
c: d2 c0 rjmp .+420 ; 0x1b2 <__vector_3>
c: ec c0 rjmp .+472 ; 0x1e6 <__vector_3>
e: 00 00 nop
10: 5a c0 rjmp .+180 ; 0xc6 <__bad_interrupt>
12: 00 00 nop
@@ -116,20 +116,20 @@ Disassembly of section .text:
98: 11 e0 ldi r17, 0x01 ; 1
9a: a0 e0 ldi r26, 0x00 ; 0
9c: b1 e0 ldi r27, 0x01 ; 1
9e: e4 e9 ldi r30, 0x94 ; 148
9e: ec e3 ldi r30, 0x3C ; 60
a0: f2 e0 ldi r31, 0x02 ; 2
a2: 00 e0 ldi r16, 0x00 ; 0
a4: 0b bf out 0x3b, r16 ; 59
a6: 02 c0 rjmp .+4 ; 0xac <__do_copy_data+0x14>
a8: 07 90 elpm r0, Z+
aa: 0d 92 st X+, r0
ac: ac 36 cpi r26, 0x6C ; 108
ac: a0 30 cpi r26, 0x00 ; 0
ae: b1 07 cpc r27, r17
b0: d9 f7 brne .-10 ; 0xa8 <__do_copy_data+0x10>
000000b2 <__do_clear_bss>:
b2: 21 e0 ldi r18, 0x01 ; 1
b4: ac e6 ldi r26, 0x6C ; 108
b4: a0 e0 ldi r26, 0x00 ; 0
b6: b1 e0 ldi r27, 0x01 ; 1
b8: 01 c0 rjmp .+2 ; 0xbc <.do_clear_bss_start>
@@ -137,22 +137,22 @@ Disassembly of section .text:
ba: 1d 92 st X+, r1
000000bc <.do_clear_bss_start>:
bc: a0 37 cpi r26, 0x70 ; 112
bc: a2 30 cpi r26, 0x02 ; 2
be: b2 07 cpc r27, r18
c0: e1 f7 brne .-8 ; 0xba <.do_clear_bss_loop>
c2: e5 d0 rcall .+458 ; 0x28e <main>
c4: e5 c0 rjmp .+458 ; 0x290 <_exit>
c2: 49 d0 rcall .+146 ; 0x156 <main>
c4: b9 c0 rjmp .+370 ; 0x238 <_exit>
000000c6 <__bad_interrupt>:
c6: 9c cf rjmp .-200 ; 0x0 <__vectors>
000000c8 <wait>:
void display(int d, int dot)
{
if(dot)
PORTD = data[d] | 0b10000000;
else
PORTD = data[d];
while (1)
{
PORTD ^= (1<<7); // Toggle PORTD.7
wait( 500 );
}
c8: 18 16 cp r1, r24
ca: 19 06 cpc r1, r25
cc: 6c f4 brge .+26 ; 0xe8 <wait+0x20>
@@ -204,216 +204,222 @@ void display(int d, int dot)
120: 1f 90 pop r1
122: 18 95 reti
00000124 <shift>:
124: 89 2b or r24, r25
126: 21 f0 breq .+8 ; 0x130 <shift+0xc>
128: 85 b3 in r24, 0x15 ; 21
12a: 86 95 lsr r24
12c: 85 bb out 0x15, r24 ; 21
12e: 03 c0 rjmp .+6 ; 0x136 <shift+0x12>
130: 85 b3 in r24, 0x15 ; 21
132: 88 0f add r24, r24
134: 85 bb out 0x15, r24 ; 21
136: af 9b sbis 0x15, 7 ; 21
138: 03 c0 rjmp .+6 ; 0x140 <shift+0x1c>
13a: 81 e0 ldi r24, 0x01 ; 1
13c: 85 bb out 0x15, r24 ; 21
13e: 08 95 ret
140: 85 b3 in r24, 0x15 ; 21
142: 81 11 cpse r24, r1
144: 02 c0 rjmp .+4 ; 0x14a <shift+0x26>
146: 80 e8 ldi r24, 0x80 ; 128
148: 85 bb out 0x15, r24 ; 21
14a: 08 95 ret
0000014c <__vector_2>:
14c: 1f 92 push r1
14e: 0f 92 push r0
150: 0f b6 in r0, 0x3f ; 63
152: 0f 92 push r0
154: 11 24 eor r1, r1
156: 0b b6 in r0, 0x3b ; 59
158: 0f 92 push r0
15a: 2f 93 push r18
15c: 3f 93 push r19
15e: 4f 93 push r20
160: 5f 93 push r21
162: 6f 93 push r22
164: 7f 93 push r23
166: 8f 93 push r24
168: 9f 93 push r25
16a: af 93 push r26
16c: bf 93 push r27
16e: ef 93 push r30
170: ff 93 push r31
172: 80 91 6e 01 lds r24, 0x016E
176: 90 91 6f 01 lds r25, 0x016F
17a: 00 97 sbiw r24, 0x00 ; 0
17c: 11 f4 brne .+4 ; 0x182 <__vector_2+0x36>
17e: 95 98 cbi 0x12, 5 ; 18
180: 05 c0 rjmp .+10 ; 0x18c <__vector_2+0x40>
182: 01 97 sbiw r24, 0x01 ; 1
184: 19 f4 brne .+6 ; 0x18c <__vector_2+0x40>
186: 81 e0 ldi r24, 0x01 ; 1
188: 90 e0 ldi r25, 0x00 ; 0
18a: cc df rcall .-104 ; 0x124 <shift>
18c: ff 91 pop r31
18e: ef 91 pop r30
190: bf 91 pop r27
192: af 91 pop r26
194: 9f 91 pop r25
196: 8f 91 pop r24
198: 7f 91 pop r23
19a: 6f 91 pop r22
19c: 5f 91 pop r21
19e: 4f 91 pop r20
1a0: 3f 91 pop r19
1a2: 2f 91 pop r18
1a4: 0f 90 pop r0
1a6: 0b be out 0x3b, r0 ; 59
1a8: 0f 90 pop r0
1aa: 0f be out 0x3f, r0 ; 63
1ac: 0f 90 pop r0
1ae: 1f 90 pop r1
1b0: 18 95 reti
000001b2 <__vector_3>:
1b2: 1f 92 push r1
1b4: 0f 92 push r0
1b6: 0f b6 in r0, 0x3f ; 63
1b8: 0f 92 push r0
1ba: 11 24 eor r1, r1
1bc: 0b b6 in r0, 0x3b ; 59
1be: 0f 92 push r0
1c0: 2f 93 push r18
1c2: 3f 93 push r19
1c4: 4f 93 push r20
1c6: 5f 93 push r21
1c8: 6f 93 push r22
1ca: 7f 93 push r23
1cc: 8f 93 push r24
1ce: 9f 93 push r25
1d0: af 93 push r26
1d2: bf 93 push r27
1d4: ef 93 push r30
1d6: ff 93 push r31
1d8: 80 e0 ldi r24, 0x00 ; 0
1da: 90 e0 ldi r25, 0x00 ; 0
1dc: a3 df rcall .-186 ; 0x124 <shift>
1de: ff 91 pop r31
1e0: ef 91 pop r30
1e2: bf 91 pop r27
1e4: af 91 pop r26
1e6: 9f 91 pop r25
1e8: 8f 91 pop r24
1ea: 7f 91 pop r23
1ec: 6f 91 pop r22
1ee: 5f 91 pop r21
1f0: 4f 91 pop r20
1f2: 3f 91 pop r19
1f4: 2f 91 pop r18
1f6: 0f 90 pop r0
1f8: 0b be out 0x3b, r0 ; 59
1fa: 0f 90 pop r0
1fc: 0f be out 0x3f, r0 ; 63
1fe: 0f 90 pop r0
200: 1f 90 pop r1
202: 18 95 reti
00000204 <opgave4>:
00000124 <opgave2>:
}
void opgave4(void)
void opgave2(void)
{
DDRD = 0xFF;
204: 8f ef ldi r24, 0xFF ; 255
206: 81 bb out 0x11, r24 ; 17
DDRC = 0x00;
208: 14 ba out 0x14, r1 ; 20
DDRD = 0xF0; //PORTD(7:4) output, PORTD(3:0) input
124: 80 ef ldi r24, 0xF0 ; 240
126: 81 bb out 0x11, r24 ; 17
DDRC = 0xFF; //PORTC(7:0) output;
128: 8f ef ldi r24, 0xFF ; 255
12a: 84 bb out 0x14, r24 ; 20
PORTC= 0x1;
12c: 81 e0 ldi r24, 0x01 ; 1
12e: 85 bb out 0x15, r24 ; 21
EICRA |= 0x28; //INT1 en INT2 falling edge
130: ea e6 ldi r30, 0x6A ; 106
132: f0 e0 ldi r31, 0x00 ; 0
134: 80 81 ld r24, Z
136: 88 62 ori r24, 0x28 ; 40
138: 80 83 st Z, r24
EIMSK |= 0x06;
13a: 89 b7 in r24, 0x39 ; 57
13c: 86 60 ori r24, 0x06 ; 6
13e: 89 bf out 0x39, r24 ; 57
opdr=1;
140: 81 e0 ldi r24, 0x01 ; 1
142: 90 e0 ldi r25, 0x00 ; 0
144: 90 93 01 01 sts 0x0101, r25
148: 80 93 00 01 sts 0x0100, r24
sei();
14c: 78 94 sei
while(1)
{
//Als een knop ingedrukt wordt, wordt de waarde daarvan de snelheid. Werkt niet met system interrupts, dus je moet de knop soms ingedrukt houden
if(PINC != 0 )
20a: 83 b3 in r24, 0x13 ; 19
20c: 88 23 and r24, r24
20e: 31 f0 breq .+12 ; 0x21c <opgave4+0x18>
{
speed = PINC;
210: 83 b3 in r24, 0x13 ; 19
212: 90 e0 ldi r25, 0x00 ; 0
214: 90 93 6a 01 sts 0x016A, r25
218: 80 93 69 01 sts 0x0169, r24
}
wait(500);
14e: 84 ef ldi r24, 0xF4 ; 244
150: 91 e0 ldi r25, 0x01 ; 1
152: ba df rcall .-140 ; 0xc8 <wait>
}
154: fc cf rjmp .-8 ; 0x14e <opgave2+0x2a>
//Schrijf de data van het huidige patroon naar PORTD
PORTD = pattern[count].data;
21c: 80 91 6c 01 lds r24, 0x016C
220: 90 91 6d 01 lds r25, 0x016D
224: fc 01 movw r30, r24
226: ee 0f add r30, r30
228: ff 1f adc r31, r31
22a: 8e 0f add r24, r30
22c: 9f 1f adc r25, r31
22e: fc 01 movw r30, r24
230: e0 50 subi r30, 0x00 ; 0
232: ff 4f sbci r31, 0xFF ; 255
234: 80 81 ld r24, Z
236: 82 bb out 0x12, r24 ; 18
//Wacht het aantal milliseconde dat in het huidige patroon staat
wait(pattern[count].delay * speed);
238: 80 91 6c 01 lds r24, 0x016C
23c: 90 91 6d 01 lds r25, 0x016D
240: fc 01 movw r30, r24
242: ee 0f add r30, r30
244: ff 1f adc r31, r31
246: 8e 0f add r24, r30
248: 9f 1f adc r25, r31
24a: fc 01 movw r30, r24
24c: e0 50 subi r30, 0x00 ; 0
24e: ff 4f sbci r31, 0xFF ; 255
250: 20 91 69 01 lds r18, 0x0169
254: 30 91 6a 01 lds r19, 0x016A
258: 81 81 ldd r24, Z+1 ; 0x01
25a: 92 81 ldd r25, Z+2 ; 0x02
25c: ac 01 movw r20, r24
25e: 24 9f mul r18, r20
260: c0 01 movw r24, r0
262: 25 9f mul r18, r21
264: 90 0d add r25, r0
266: 34 9f mul r19, r20
268: 90 0d add r25, r0
26a: 11 24 eor r1, r1
26c: 2d df rcall .-422 ; 0xc8 <wait>
count++; //patroon verder
26e: 80 91 6c 01 lds r24, 0x016C
272: 90 91 6d 01 lds r25, 0x016D
276: 01 96 adiw r24, 0x01 ; 1
278: 90 93 6d 01 sts 0x016D, r25
27c: 80 93 6c 01 sts 0x016C, r24
//als alle patronen geweest zijn, opnieuw beginnen
if(count >= NELEMS(pattern))
280: 83 97 sbiw r24, 0x23 ; 35
282: 18 f2 brcs .-122 ; 0x20a <opgave4+0x6>
{
count = 0;
284: 10 92 6d 01 sts 0x016D, r1
288: 10 92 6c 01 sts 0x016C, r1
28c: be cf rjmp .-132 ; 0x20a <opgave4+0x6>
0000028e <main>:
00000156 <main>:
notes: Slow background task after init ISR
Version : DMK, Initial code
*******************************************************************/
{
//powerpointOpg();
//opgave2();
//opgave3();
opgave4();
28e: ba df rcall .-140 ; 0x204 <opgave4>
opgave2();
156: e6 df rcall .-52 ; 0x124 <opgave2>
00000290 <_exit>:
290: f8 94 cli
00000158 <shift>:
}
00000292 <__stop_program>:
292: ff cf rjmp .-2 ; 0x292 <__stop_program>
void shift(int i)
{
if(i)
158: 89 2b or r24, r25
15a: 21 f0 breq .+8 ; 0x164 <shift+0xc>
PORTC = (PORTC>>1);
15c: 85 b3 in r24, 0x15 ; 21
15e: 86 95 lsr r24
160: 85 bb out 0x15, r24 ; 21
162: 03 c0 rjmp .+6 ; 0x16a <shift+0x12>
else
PORTC = (PORTC<<1);
164: 85 b3 in r24, 0x15 ; 21
166: 88 0f add r24, r24
168: 85 bb out 0x15, r24 ; 21
//Als het looplicht aan het einde is
if (PORTC >= 0x80)
16a: af 9b sbis 0x15, 7 ; 21
16c: 03 c0 rjmp .+6 ; 0x174 <shift+0x1c>
{
PORTC= 0x01;
16e: 81 e0 ldi r24, 0x01 ; 1
170: 85 bb out 0x15, r24 ; 21
172: 08 95 ret
}
//Als het looplicht aan het begin is
else if (PORTC < 0x1)
174: 85 b3 in r24, 0x15 ; 21
176: 81 11 cpse r24, r1
178: 02 c0 rjmp .+4 ; 0x17e <shift+0x26>
{
PORTC= 0x80;
17a: 80 e8 ldi r24, 0x80 ; 128
17c: 85 bb out 0x15, r24 ; 21
17e: 08 95 ret
00000180 <__vector_2>:
PORTD |= (1<<5);
}
/******************************************************************/
ISR( INT1_vect )
{
180: 1f 92 push r1
182: 0f 92 push r0
184: 0f b6 in r0, 0x3f ; 63
186: 0f 92 push r0
188: 11 24 eor r1, r1
18a: 0b b6 in r0, 0x3b ; 59
18c: 0f 92 push r0
18e: 2f 93 push r18
190: 3f 93 push r19
192: 4f 93 push r20
194: 5f 93 push r21
196: 6f 93 push r22
198: 7f 93 push r23
19a: 8f 93 push r24
19c: 9f 93 push r25
19e: af 93 push r26
1a0: bf 93 push r27
1a2: ef 93 push r30
1a4: ff 93 push r31
inputs:
outputs:
notes: Clear PORTD.5
Version : DMK, Initial code
*******************************************************************/
if(opdr==0)
1a6: 80 91 00 01 lds r24, 0x0100
1aa: 90 91 01 01 lds r25, 0x0101
1ae: 00 97 sbiw r24, 0x00 ; 0
1b0: 11 f4 brne .+4 ; 0x1b6 <__vector_2+0x36>
{
PORTD &= ~(1<<5);
1b2: 95 98 cbi 0x12, 5 ; 18
1b4: 05 c0 rjmp .+10 ; 0x1c0 <__vector_2+0x40>
}
else if(opdr==1)
1b6: 01 97 sbiw r24, 0x01 ; 1
1b8: 19 f4 brne .+6 ; 0x1c0 <__vector_2+0x40>
{
shift(1);
1ba: 81 e0 ldi r24, 0x01 ; 1
1bc: 90 e0 ldi r25, 0x00 ; 0
1be: cc df rcall .-104 ; 0x158 <shift>
}
}
1c0: ff 91 pop r31
1c2: ef 91 pop r30
1c4: bf 91 pop r27
1c6: af 91 pop r26
1c8: 9f 91 pop r25
1ca: 8f 91 pop r24
1cc: 7f 91 pop r23
1ce: 6f 91 pop r22
1d0: 5f 91 pop r21
1d2: 4f 91 pop r20
1d4: 3f 91 pop r19
1d6: 2f 91 pop r18
1d8: 0f 90 pop r0
1da: 0b be out 0x3b, r0 ; 59
1dc: 0f 90 pop r0
1de: 0f be out 0x3f, r0 ; 63
1e0: 0f 90 pop r0
1e2: 1f 90 pop r1
1e4: 18 95 reti
000001e6 <__vector_3>:
inputs:
outputs:
notes: Clear PORTD.3
Version : DMK, Initial code
*******************************************************************/
{
1e6: 1f 92 push r1
1e8: 0f 92 push r0
1ea: 0f b6 in r0, 0x3f ; 63
1ec: 0f 92 push r0
1ee: 11 24 eor r1, r1
1f0: 0b b6 in r0, 0x3b ; 59
1f2: 0f 92 push r0
1f4: 2f 93 push r18
1f6: 3f 93 push r19
1f8: 4f 93 push r20
1fa: 5f 93 push r21
1fc: 6f 93 push r22
1fe: 7f 93 push r23
200: 8f 93 push r24
202: 9f 93 push r25
204: af 93 push r26
206: bf 93 push r27
208: ef 93 push r30
20a: ff 93 push r31
shift(0);
20c: 80 e0 ldi r24, 0x00 ; 0
20e: 90 e0 ldi r25, 0x00 ; 0
210: a3 df rcall .-186 ; 0x158 <shift>
}
212: ff 91 pop r31
214: ef 91 pop r30
216: bf 91 pop r27
218: af 91 pop r26
21a: 9f 91 pop r25
21c: 8f 91 pop r24
21e: 7f 91 pop r23
220: 6f 91 pop r22
222: 5f 91 pop r21
224: 4f 91 pop r20
226: 3f 91 pop r19
228: 2f 91 pop r18
22a: 0f 90 pop r0
22c: 0b be out 0x3b, r0 ; 59
22e: 0f 90 pop r0
230: 0f be out 0x3f, r0 ; 63
232: 0f 90 pop r0
234: 1f 90 pop r1
236: 18 95 reti
00000238 <_exit>:
238: f8 94 cli
0000023a <__stop_program>:
23a: ff cf rjmp .-2 ; 0x23a <__stop_program>