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

Fixes regenbooglicht

Browse Source
This commit is contained in:
Bluepr1nt
2016-03-01 13:18:03 +01:00
parent 7e69994a43
commit 27f095778c
4 changed files with 317 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MIC-Week4/Debug/MIC-Week4.lss
+269 -207
View File
@@ -3,29 +3,29 @@ MIC-Week4.elf: file format elf32-avr
Sections:
Idx Name Size VMA LMA File off Algn
0 .data 00000000 00800100 00800100 00000232 2**0
0 .data 00000000 00800100 00800100 00000256 2**0
CONTENTS, ALLOC, LOAD, DATA
1 .text 000001de 00000000 00000000 00000054 2**1
1 .text 00000202 00000000 00000000 00000054 2**1
CONTENTS, ALLOC, LOAD, READONLY, CODE
2 .comment 00000030 00000000 00000000 00000232 2**0
2 .comment 00000030 00000000 00000000 00000256 2**0
CONTENTS, READONLY
3 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 00000264 2**2
3 .note.gnu.avr.deviceinfo 0000003c 00000000 00000000 00000288 2**2
CONTENTS, READONLY
4 .debug_aranges 00000068 00000000 00000000 000002a0 2**0
4 .debug_aranges 00000060 00000000 00000000 000002c4 2**0
CONTENTS, READONLY, DEBUGGING
5 .debug_info 00000d09 00000000 00000000 00000308 2**0
5 .debug_info 00000b08 00000000 00000000 00000324 2**0
CONTENTS, READONLY, DEBUGGING
6 .debug_abbrev 00000239 00000000 00000000 00001011 2**0
6 .debug_abbrev 0000021b 00000000 00000000 00000e2c 2**0
CONTENTS, READONLY, DEBUGGING
7 .debug_line 000006bd 00000000 00000000 0000124a 2**0
7 .debug_line 000005f5 00000000 00000000 00001047 2**0
CONTENTS, READONLY, DEBUGGING
8 .debug_frame 000000b4 00000000 00000000 00001908 2**2
8 .debug_frame 000000a4 00000000 00000000 0000163c 2**2
CONTENTS, READONLY, DEBUGGING
9 .debug_str 0000021e 00000000 00000000 000019bc 2**0
9 .debug_str 00000214 00000000 00000000 000016e0 2**0
CONTENTS, READONLY, DEBUGGING
10 .debug_loc 00000793 00000000 00000000 00001bda 2**0
10 .debug_loc 000005d6 00000000 00000000 000018f4 2**0
CONTENTS, READONLY, DEBUGGING
11 .debug_ranges 000001d8 00000000 00000000 0000236d 2**0
11 .debug_ranges 00000150 00000000 00000000 00001eca 2**0
CONTENTS, READONLY, DEBUGGING
Disassembly of section .text:
@@ -123,8 +123,8 @@ Disassembly of section .text:
a2: a0 30 cpi r26, 0x00 ; 0
a4: b2 07 cpc r27, r18
a6: e1 f7 brne .-8 ; 0xa0 <.do_clear_bss_loop>
a8: 86 d0 rcall .+268 ; 0x1b6 <main>
aa: 97 c0 rjmp .+302 ; 0x1da <_exit>
a8: 98 d0 rcall .+304 ; 0x1da <main>
aa: a9 c0 rjmp .+338 ; 0x1fe <_exit>
000000ac <__bad_interrupt>:
ac: a9 cf rjmp .-174 ; 0x0 <__vectors>
@@ -198,273 +198,335 @@ int alleKleuren(void)
fe: d7 df rcall .-82 ; 0xae <wait>
}
// Set pulse width for RED on pin PB5, 0=off, 255=max
void setRed( unsigned char red )
{
OCR1A = red;
100: 0f 2e mov r0, r31
102: fa e4 ldi r31, 0x4A ; 74
104: af 2e mov r10, r31
106: b1 2c mov r11, r1
108: f0 2d mov r31, r0
10a: 81 2c mov r8, r1
10c: 91 2c mov r9, r1
}
// Set pulse width for Blue on pin PB5, 0=off, 255=max
void setBlue( unsigned char blue )
{
OCR1C = blue;
10e: c8 e7 ldi r28, 0x78 ; 120
110: d0 e0 ldi r29, 0x00 ; 0
{
setGreen( green ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
for (int blue = 0; blue<=255; blue+=delta2)
112: 38 2c mov r3, r8
114: 29 2c mov r2, r9
116: 48 2c mov r4, r8
118: 59 2c mov r5, r9
}
// Set pulse width for RED on pin PB5, 0=off, 255=max
void setRed( unsigned char red )
{
OCR1A = red;
11a: f5 01 movw r30, r10
11c: 91 82 std Z+1, r9 ; 0x01
11e: 80 82 st Z, r8
}
// Set pulse width for Blue on pin PB5, 0=off, 255=max
void setBlue( unsigned char blue )
{
OCR1C = blue;
120: 99 82 std Y+1, r9 ; 0x01
122: 88 82 st Y, r8
}
// Set pulse width for Green on pin PB5, 0=off, 255=max
void setGreen( unsigned char green )
{
OCR1B = green;
124: 99 bc out 0x29, r9 ; 41
126: 88 bc out 0x28, r8 ; 40
int delta2 = 1;
setRed (0);
setBlue(0);
setGreen(0);
for (int red = 0; red<=255; red+=delta)
128: 64 01 movw r12, r8
100: 08 e7 ldi r16, 0x78 ; 120
102: 10 e0 ldi r17, 0x00 ; 0
timer1Init();
wait(100);
while (1)
{
int delta = 1;
12a: ee 24 eor r14, r14
12c: e3 94 inc r14
12e: f1 2c mov r15, r1
130: c6 01 movw r24, r12
132: 99 27 eor r25, r25
104: aa 24 eor r10, r10
106: a3 94 inc r10
108: b1 2c mov r11, r1
setGreen( green ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
}
for (int blue = 0; blue<=255; blue+=delta2)
10a: cc 24 eor r12, r12
10c: ca 94 dec r12
10e: d1 2c mov r13, r1
}
// Set pulse width for RED on pin PB5, 0=off, 255=max
void setRed( unsigned char red )
{
OCR1A = red;
134: f5 01 movw r30, r10
136: 91 83 std Z+1, r25 ; 0x01
138: 80 83 st Z, r24
for (int red = 0; red<=255; red+=delta)
{
setRed( red ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
13a: 8a e0 ldi r24, 0x0A ; 10
13c: 90 e0 ldi r25, 0x00 ; 0
13e: b7 df rcall .-146 ; 0xae <wait>
for (int green = 0; green<=255; green+=delta1)
140: 03 2d mov r16, r3
142: 12 2d mov r17, r2
144: c8 01 movw r24, r16
146: 99 27 eor r25, r25
}
// Set pulse width for Green on pin PB5, 0=off, 255=max
void setGreen( unsigned char green )
{
OCR1B = green;
148: 99 bd out 0x29, r25 ; 41
14a: 88 bd out 0x28, r24 ; 40
for (int green = 0; green<=255; green+=delta1)
{
setGreen( green ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
14c: 8a e0 ldi r24, 0x0A ; 10
14e: 90 e0 ldi r25, 0x00 ; 0
150: ae df rcall .-164 ; 0xae <wait>
for (int blue = 0; blue<=255; blue+=delta2)
152: 64 2c mov r6, r4
154: 75 2c mov r7, r5
156: c3 01 movw r24, r6
158: 99 27 eor r25, r25
110: 1b bc out 0x2b, r1 ; 43
112: 1a bc out 0x2a, r1 ; 42
}
// Set pulse width for Blue on pin PB5, 0=off, 255=max
void setBlue( unsigned char blue )
{
OCR1C = blue;
15a: 99 83 std Y+1, r25 ; 0x01
15c: 88 83 st Y, r24
114: f8 01 movw r30, r16
116: 11 82 std Z+1, r1 ; 0x01
118: 10 82 st Z, r1
}
for (int blue = 0; blue<=255; blue+=delta2)
{
setBlue( blue ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
15e: 8a e0 ldi r24, 0x0A ; 10
160: 90 e0 ldi r25, 0x00 ; 0
162: a5 df rcall .-182 ; 0xae <wait>
{
setGreen( green ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
for (int blue = 0; blue<=255; blue+=delta2)
164: ff ef ldi r31, 0xFF ; 255
166: 6f 1a sub r6, r31
168: 7f 0a sbc r7, r31
16a: 61 14 cp r6, r1
16c: 81 e0 ldi r24, 0x01 ; 1
16e: 78 06 cpc r7, r24
170: 91 f7 brne .-28 ; 0x156 <alleKleuren+0x62>
{
setRed( red ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
for (int green = 0; green<=255; green+=delta1)
172: 0f 5f subi r16, 0xFF ; 255
174: 1f 4f sbci r17, 0xFF ; 255
176: 01 15 cp r16, r1
178: e1 e0 ldi r30, 0x01 ; 1
17a: 1e 07 cpc r17, r30
17c: 19 f7 brne .-58 ; 0x144 <alleKleuren+0x50>
17e: c7 01 movw r24, r14
180: 8e 5f subi r24, 0xFE ; 254
182: 9d 4f sbci r25, 0xFD ; 253
184: 7c 01 movw r14, r24
// Set pulse width for Green on pin PB5, 0=off, 255=max
void setGreen( unsigned char green )
{
OCR1B = green;
11a: 19 bc out 0x29, r1 ; 41
11c: 18 bc out 0x28, r1 ; 40
int delta2 = 1;
setRed (0);
setBlue(0);
setGreen(0);
for (int red = 0; red<=255; red+=delta)
186: c8 0e add r12, r24
188: d9 1e adc r13, r25
18a: ff ef ldi r31, 0xFF ; 255
18c: cf 16 cp r12, r31
18e: d1 04 cpc r13, r1
190: 79 f2 breq .-98 ; 0x130 <alleKleuren+0x3c>
192: 74 f2 brlt .-100 ; 0x130 <alleKleuren+0x3c>
194: 0f ef ldi r16, 0xFF ; 255
196: 10 e0 ldi r17, 0x00 ; 0
198: c8 01 movw r24, r16
19a: 99 27 eor r25, r25
11e: c0 e0 ldi r28, 0x00 ; 0
120: d0 e0 ldi r29, 0x00 ; 0
timer1Init();
wait(100);
while (1)
{
int delta = 1;
122: ea 2c mov r14, r10
124: fb 2c mov r15, r11
126: ce 01 movw r24, r28
128: 99 27 eor r25, r25
}
// Set pulse width for RED on pin PB5, 0=off, 255=max
void setRed( unsigned char red )
{
OCR1A = red;
19c: f5 01 movw r30, r10
19e: 91 83 std Z+1, r25 ; 0x01
1a0: 80 83 st Z, r24
12a: 9b bd out 0x2b, r25 ; 43
12c: 8a bd out 0x2a, r24 ; 42
setGreen(0);
for (int red = 0; red<=255; red+=delta)
{
setRed( red ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
12e: f2 e0 ldi r31, 0x02 ; 2
130: ef 0e add r14, r31
132: f1 1c adc r15, r1
wait(10); // delay of 100 ms (busy waiting)
134: 8a e0 ldi r24, 0x0A ; 10
136: 90 e0 ldi r25, 0x00 ; 0
138: ba df rcall .-140 ; 0xae <wait>
int delta2 = 1;
setRed (0);
setBlue(0);
setGreen(0);
for (int red = 0; red<=255; red+=delta)
13a: ce 0d add r28, r14
13c: df 1d adc r29, r15
13e: cf 3f cpi r28, 0xFF ; 255
140: d1 05 cpc r29, r1
142: 89 f3 breq .-30 ; 0x126 <alleKleuren+0x32>
144: 84 f3 brlt .-32 ; 0x126 <alleKleuren+0x32>
146: c0 e0 ldi r28, 0x00 ; 0
148: d0 e0 ldi r29, 0x00 ; 0
14a: ce 01 movw r24, r28
14c: 99 27 eor r25, r25
}
// Set pulse width for Green on pin PB5, 0=off, 255=max
void setGreen( unsigned char green )
{
OCR1B = green;
14e: 99 bd out 0x29, r25 ; 41
150: 88 bd out 0x28, r24 ; 40
for (int green = 0; green<=255; green+=delta1)
{
setGreen( green ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
152: 8a e0 ldi r24, 0x0A ; 10
154: 90 e0 ldi r25, 0x00 ; 0
156: ab df rcall .-170 ; 0xae <wait>
setRed( red ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
}
for (int green = 0; green<=255; green+=delta1)
158: 21 96 adiw r28, 0x01 ; 1
15a: c1 15 cp r28, r1
15c: 81 e0 ldi r24, 0x01 ; 1
15e: d8 07 cpc r29, r24
160: a1 f7 brne .-24 ; 0x14a <alleKleuren+0x56>
162: 33 c0 rjmp .+102 ; 0x1ca <alleKleuren+0xd6>
164: ce 01 movw r24, r28
166: 99 27 eor r25, r25
}
// Set pulse width for Blue on pin PB5, 0=off, 255=max
void setBlue( unsigned char blue )
{
OCR1C = blue;
168: f8 01 movw r30, r16
16a: 91 83 std Z+1, r25 ; 0x01
16c: 80 83 st Z, r24
for (int blue = 0; blue<=255; blue+=delta2)
{
setBlue( blue ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
16e: 8a e0 ldi r24, 0x0A ; 10
170: 90 e0 ldi r25, 0x00 ; 0
172: 9d df rcall .-198 ; 0xae <wait>
setGreen( green ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
}
for (int blue = 0; blue<=255; blue+=delta2)
174: 21 96 adiw r28, 0x01 ; 1
176: c1 15 cp r28, r1
178: f1 e0 ldi r31, 0x01 ; 1
17a: df 07 cpc r29, r31
17c: 99 f7 brne .-26 ; 0x164 <alleKleuren+0x70>
17e: 28 c0 rjmp .+80 ; 0x1d0 <alleKleuren+0xdc>
180: ce 01 movw r24, r28
182: 99 27 eor r25, r25
}
// Set pulse width for RED on pin PB5, 0=off, 255=max
void setRed( unsigned char red )
{
OCR1A = red;
184: 9b bd out 0x2b, r25 ; 43
186: 8a bd out 0x2a, r24 ; 42
}
for (int red = 255; red>=0; red-=delta)
{
setRed( red ); // 8-bits PWM on pin OCR1a
delta -= 2; // progressive steps down
1a2: f2 e0 ldi r31, 0x02 ; 2
1a4: ef 1a sub r14, r31
1a6: f1 08 sbc r15, r1
wait(100); // delay of 100 ms (busy waiting)
1a8: 84 e6 ldi r24, 0x64 ; 100
1aa: 90 e0 ldi r25, 0x00 ; 0
1ac: 80 df rcall .-256 ; 0xae <wait>
}
}
188: 82 e0 ldi r24, 0x02 ; 2
18a: e8 1a sub r14, r24
18c: f1 08 sbc r15, r1
wait(10); // delay of 100 ms (busy waiting)
18e: 8a e0 ldi r24, 0x0A ; 10
190: 90 e0 ldi r25, 0x00 ; 0
192: 8d df rcall .-230 ; 0xae <wait>
setBlue( blue ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
}
for (int red = 255; red>=0; red-=delta)
1ae: 0e 19 sub r16, r14
1b0: 1f 09 sbc r17, r15
1b2: 92 f7 brpl .-28 ; 0x198 <alleKleuren+0xa4>
1b4: b2 cf rjmp .-156 ; 0x11a <alleKleuren+0x26>
194: ce 19 sub r28, r14
196: df 09 sbc r29, r15
198: 9a f7 brpl .-26 ; 0x180 <alleKleuren+0x8c>
19a: cc 2d mov r28, r12
19c: dd 2d mov r29, r13
19e: ce 01 movw r24, r28
1a0: 99 27 eor r25, r25
}
000001b6 <main>:
// Set pulse width for Green on pin PB5, 0=off, 255=max
void setGreen( unsigned char green )
{
OCR1B = green;
1a2: 99 bd out 0x29, r25 ; 41
1a4: 88 bd out 0x28, r24 ; 40
for (int green = 255; green>=0; green-=delta1)
{
setGreen( green ); // 8-bits PWM on pin OCR1a
delta -= 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
1a6: 8a e0 ldi r24, 0x0A ; 10
1a8: 90 e0 ldi r25, 0x00 ; 0
1aa: 81 df rcall .-254 ; 0xae <wait>
setRed( red ); // 8-bits PWM on pin OCR1a
delta -= 2; // progressive steps down
wait(10); // delay of 100 ms (busy waiting)
}
for (int green = 255; green>=0; green-=delta1)
1ac: 21 97 sbiw r28, 0x01 ; 1
1ae: b8 f7 brcc .-18 ; 0x19e <alleKleuren+0xaa>
1b0: cc 2d mov r28, r12
1b2: dd 2d mov r29, r13
1b4: ce 01 movw r24, r28
1b6: 99 27 eor r25, r25
}
// Set pulse width for Blue on pin PB5, 0=off, 255=max
void setBlue( unsigned char blue )
{
OCR1C = blue;
1b8: f8 01 movw r30, r16
1ba: 91 83 std Z+1, r25 ; 0x01
1bc: 80 83 st Z, r24
for (int blue = 255; blue>=0; blue-=delta2)
{
setBlue( blue ); // 8-bits PWM on pin OCR1a
delta -= 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
1be: 8a e0 ldi r24, 0x0A ; 10
1c0: 90 e0 ldi r25, 0x00 ; 0
1c2: 75 df rcall .-278 ; 0xae <wait>
setGreen( green ); // 8-bits PWM on pin OCR1a
delta -= 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
}
for (int blue = 255; blue>=0; blue-=delta2)
1c4: 21 97 sbiw r28, 0x01 ; 1
1c6: b0 f7 brcc .-20 ; 0x1b4 <alleKleuren+0xc0>
1c8: a3 cf rjmp .-186 ; 0x110 <alleKleuren+0x1c>
setRed( red ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
}
for (int green = 0; green<=255; green+=delta1)
1ca: c0 e0 ldi r28, 0x00 ; 0
1cc: d0 e0 ldi r29, 0x00 ; 0
1ce: ca cf rjmp .-108 ; 0x164 <alleKleuren+0x70>
1d0: 8c ef ldi r24, 0xFC ; 252
1d2: f8 1a sub r15, r24
setGreen( green ); // 8-bits PWM on pin OCR1a
delta += 2; // progressive steps up
wait(10); // delay of 100 ms (busy waiting)
}
for (int blue = 0; blue<=255; blue+=delta2)
1d4: cc 2d mov r28, r12
1d6: dd 2d mov r29, r13
1d8: d3 cf rjmp .-90 ; 0x180 <alleKleuren+0x8c>
000001da <main>:
// Main program: Counting on T1
int main( void )
{
DDRB = 0xFF;
1b6: 8f ef ldi r24, 0xFF ; 255
1b8: 87 bb out 0x17, r24 ; 23
1da: 8f ef ldi r24, 0xFF ; 255
1dc: 87 bb out 0x17, r24 ; 23
DDRF = 0x00; // set PORTF for input (ADC)
1ba: 10 92 61 00 sts 0x0061, r1
1de: 10 92 61 00 sts 0x0061, r1
DDRA = 0xFF; // set PORTA for output
1be: 8a bb out 0x1a, r24 ; 26
1e2: 8a bb out 0x1a, r24 ; 26
adcInit(); // initialize ADC
1c0: 94 df rcall .-216 ; 0xea <adcInit>
1e4: 82 df rcall .-252 ; 0xea <adcInit>
timer1Init();
1c2: 86 df rcall .-244 ; 0xd0 <timer1Init>
1e6: 74 df rcall .-280 ; 0xd0 <timer1Init>
while (1)
{
ADCSRA |= BIT(6); // Start ADC
1c4: 36 9a sbi 0x06, 6 ; 6
1e8: 36 9a sbi 0x06, 6 ; 6
while ( ADCSRA & BIT(6) ) ; // Wait for completion
1c6: 36 99 sbic 0x06, 6 ; 6
1c8: fe cf rjmp .-4 ; 0x1c6 <main+0x10>
1ea: 36 99 sbic 0x06, 6 ; 6
1ec: fe cf rjmp .-4 ; 0x1ea <main+0x10>
setRed(ADCH); // Show MSB (bit 9:2) of ADC
1ca: 85 b1 in r24, 0x05 ; 5
1ee: 85 b1 in r24, 0x05 ; 5
}
// Set pulse width for RED on pin PB5, 0=off, 255=max
void setRed( unsigned char red )
{
OCR1A = red;
1cc: 90 e0 ldi r25, 0x00 ; 0
1ce: 9b bd out 0x2b, r25 ; 43
1d0: 8a bd out 0x2a, r24 ; 42
1f0: 90 e0 ldi r25, 0x00 ; 0
1f2: 9b bd out 0x2b, r25 ; 43
1f4: 8a bd out 0x2a, r24 ; 42
while (1)
{
ADCSRA |= BIT(6); // Start ADC
while ( ADCSRA & BIT(6) ) ; // Wait for completion
setRed(ADCH); // Show MSB (bit 9:2) of ADC
wait(100); // every 50 ms (busy waiting)
1d2: 84 e6 ldi r24, 0x64 ; 100
1d4: 90 e0 ldi r25, 0x00 ; 0
1d6: 6b df rcall .-298 ; 0xae <wait>
1f6: 84 e6 ldi r24, 0x64 ; 100
1f8: 90 e0 ldi r25, 0x00 ; 0
1fa: 59 df rcall .-334 ; 0xae <wait>
//opgaveextra();
//testColor();
alleKleuren();
1d8: 8d df rcall .-230 ; 0xf4 <alleKleuren>
1fc: 7b df rcall .-266 ; 0xf4 <alleKleuren>
000001da <_exit>:
1da: f8 94 cli
000001fe <_exit>:
1fe: f8 94 cli
000001dc <__stop_program>:
1dc: ff cf rjmp .-2 ; 0x1dc <__stop_program>
00000200 <__stop_program>:
200: ff cf rjmp .-2 ; 0x200 <__stop_program>